Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 164 insertions, 164 deletions

diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 23ea672..76d8864 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.32.1, the Vala compiler
+/* VideoSupport.c generated by valac 0.34.4, the Vala compiler
  * generated from VideoSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1920,103 +1920,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1936 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1945 "VideoSupport.c"
 	}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1951 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1960 "VideoSupport.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1966 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1975 "VideoSupport.c"
 	} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1979 "VideoSupport.c"
 	}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1987 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1996 "VideoSupport.c"
 	} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 2000 "VideoSupport.c"
 	}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2022 "VideoSupport.c"
 }
@@ -2321,7 +2321,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2324 "VideoSupport.c"
-			goto __catch490_g_error;
+			goto __catch492_g_error;
 		}
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
@@ -2335,8 +2335,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (_tmp3_);
 #line 2337 "VideoSupport.c"
 	}
-	goto __finally490;
-	__catch490_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2355,7 +2355,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		return result;
 #line 2357 "VideoSupport.c"
 	}
-	__finally490:
+	__finally492:
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2474,7 +2474,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 2477 "VideoSupport.c"
-				goto __catch491_video_error;
+				goto __catch493_video_error;
 			}
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
@@ -2500,8 +2500,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		clip_duration = _tmp26_;
 #line 2502 "VideoSupport.c"
 	}
-	goto __finally491;
-	__catch491_video_error:
+	goto __finally493;
+	__catch493_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
@@ -2554,7 +2554,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2555 "VideoSupport.c"
 	}
-	__finally491:
+	__finally493:
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2603,7 +2603,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2605 "VideoSupport.c"
-			goto __catch492_g_error;
+			goto __catch494_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
@@ -2699,8 +2699,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_media_metadata_unref0 (metadata);
 #line 2700 "VideoSupport.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
@@ -2719,7 +2719,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2720 "VideoSupport.c"
 	}
-	__finally492:
+	__finally494:
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3092,7 +3092,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3094 "VideoSupport.c"
-			goto __catch493_g_error;
+			goto __catch495_g_error;
 		}
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
@@ -3115,7 +3115,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
 #line 3117 "VideoSupport.c"
-			goto __catch493_g_error;
+			goto __catch495_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
@@ -3208,8 +3208,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (d);
 #line 3209 "VideoSupport.c"
 	}
-	goto __finally493;
-	__catch493_g_error:
+	goto __finally495;
+	__catch495_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3249,9 +3249,9 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
 #line 3251 "VideoSupport.c"
-		goto __finally493;
+		goto __finally495;
 	}
-	__finally493:
+	__finally495:
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3408,7 +3408,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3410 "VideoSupport.c"
-			goto __catch494_g_error;
+			goto __catch496_g_error;
 		}
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
@@ -3416,8 +3416,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
 #line 3417 "VideoSupport.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally496;
+	__catch496_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -3455,7 +3455,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		return result;
 #line 3456 "VideoSupport.c"
 	}
-	__finally494:
+	__finally496:
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3490,7 +3490,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp22_ = unix_input;
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = _tmp23_;
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3498,7 +3498,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
 #line 3500 "VideoSupport.c"
-			goto __catch495_g_error;
+			goto __catch497_g_error;
 		}
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
@@ -3514,8 +3514,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (unix_input);
 #line 3515 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
@@ -3538,7 +3538,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_error_free0 (e);
 #line 3539 "VideoSupport.c"
 	}
-	__finally495:
+	__finally497:
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4947,7 +4947,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 #line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4946 "VideoSupport.c"
-				goto __catch496_g_error;
+				goto __catch498_g_error;
 			}
 #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
@@ -4959,8 +4959,8 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_object_unref0 (_tmp35_);
 #line 4957 "VideoSupport.c"
 		}
-		goto __finally496;
-		__catch496_g_error:
+		goto __finally498;
+		__catch498_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
@@ -4986,7 +4986,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_error_free0 (err);
 #line 4984 "VideoSupport.c"
 		}
-		__finally496:
+		__finally498:
 #line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5097,7 +5097,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5096 "VideoSupport.c"
-				goto __catch497_database_error;
+				goto __catch499_database_error;
 			}
 #line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5130,7 +5130,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_tmp5_->backlinks = _tmp7_;
 #line 5128 "VideoSupport.c"
 			}
-			__finally498:
+			__finally500:
 			{
 				VideoRow* _tmp8_ = NULL;
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5144,7 +5144,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5143 "VideoSupport.c"
-					goto __catch497_database_error;
+					goto __catch499_database_error;
 				}
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5156,8 +5156,8 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			}
 		}
 	}
-	goto __finally497;
-	__catch497_database_error:
+	goto __finally499;
+	__catch499_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5184,7 +5184,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_error_free0 (err);
 #line 5182 "VideoSupport.c"
 	}
-	__finally497:
+	__finally499:
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5272,7 +5272,7 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			return result;
 #line 5270 "VideoSupport.c"
 		}
-		__finally499:
+		__finally501:
 		{
 			VideoRow* _tmp12_ = NULL;
 #line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5387,7 +5387,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 #line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5386 "VideoSupport.c"
-				goto __catch500_database_error;
+				goto __catch502_database_error;
 			}
 #line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5418,8 +5418,8 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 #line 5415 "VideoSupport.c"
 		}
 	}
-	goto __finally500;
-	__catch500_database_error:
+	goto __finally502;
+	__catch502_database_error:
 	{
 		GError* err = NULL;
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5444,7 +5444,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		return result;
 #line 5442 "VideoSupport.c"
 	}
-	__finally500:
+	__finally502:
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5510,7 +5510,7 @@ void video_import_failed (Video* video) {
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5509 "VideoSupport.c"
-				goto __catch501_database_error;
+				goto __catch503_database_error;
 			}
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5521,8 +5521,8 @@ void video_import_failed (Video* video) {
 #line 5518 "VideoSupport.c"
 		}
 	}
-	goto __finally501;
-	__catch501_database_error:
+	goto __finally503;
+	__catch503_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -5538,7 +5538,7 @@ void video_import_failed (Video* video) {
 		_g_error_free0 (err);
 #line 5536 "VideoSupport.c"
 	}
-	__finally501:
+	__finally503:
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5617,7 +5617,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			_tmp11_ = backing[0];
 #line 5615 "VideoSupport.c"
 		}
-		__finally502:
+		__finally504:
 		{
 			VideoRow* _tmp12_ = NULL;
 #line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5734,7 +5734,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			return result;
 #line 5732 "VideoSupport.c"
 		}
-		__finally503:
+		__finally505:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5938,7 +5938,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			return;
 #line 5936 "VideoSupport.c"
 		}
-		__finally504:
+		__finally506:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6013,7 +6013,7 @@ static gchar* video_real_get_title (MediaSource* base) {
 			return result;
 #line 6011 "VideoSupport.c"
 		}
-		__finally505:
+		__finally507:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6112,7 +6112,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 #line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6111 "VideoSupport.c"
-						goto __catch507_database_error;
+						goto __catch509_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6133,8 +6133,8 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 #line 6130 "VideoSupport.c"
 				}
 			}
-			goto __finally507;
-			__catch507_database_error:
+			goto __finally509;
+			__catch509_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6163,7 +6163,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				return;
 #line 6161 "VideoSupport.c"
 			}
-			__finally507:
+			__finally509:
 #line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6166 "VideoSupport.c"
@@ -6197,7 +6197,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp16_->title = _tmp18_;
 #line 6195 "VideoSupport.c"
 		}
-		__finally506:
+		__finally508:
 		{
 			VideoRow* _tmp19_ = NULL;
 #line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6272,7 +6272,7 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			return result;
 #line 6270 "VideoSupport.c"
 		}
-		__finally508:
+		__finally510:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6374,7 +6374,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6373 "VideoSupport.c"
-						goto __catch510_database_error;
+						goto __catch512_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6395,8 +6395,8 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 6392 "VideoSupport.c"
 				}
 			}
-			goto __finally510;
-			__catch510_database_error:
+			goto __finally512;
+			__catch512_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6427,7 +6427,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				return result;
 #line 6425 "VideoSupport.c"
 			}
-			__finally510:
+			__finally512:
 #line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6430 "VideoSupport.c"
@@ -6461,7 +6461,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			_tmp16_->comment = _tmp18_;
 #line 6459 "VideoSupport.c"
 		}
-		__finally509:
+		__finally511:
 		{
 			VideoRow* _tmp19_ = NULL;
 #line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6537,7 +6537,7 @@ static Rating video_real_get_rating (MediaSource* base) {
 			return result;
 #line 6535 "VideoSupport.c"
 		}
-		__finally511:
+		__finally513:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6638,7 +6638,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 #line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6637 "VideoSupport.c"
-						goto __catch513_database_error;
+						goto __catch515_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6657,8 +6657,8 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 #line 6654 "VideoSupport.c"
 				}
 			}
-			goto __finally513;
-			__catch513_database_error:
+			goto __finally515;
+			__catch515_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6685,7 +6685,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				return;
 #line 6683 "VideoSupport.c"
 			}
-			__finally513:
+			__finally515:
 #line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6688 "VideoSupport.c"
@@ -6713,7 +6713,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp16_->rating = _tmp17_;
 #line 6711 "VideoSupport.c"
 		}
-		__finally512:
+		__finally514:
 		{
 			VideoRow* _tmp18_ = NULL;
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6772,7 +6772,7 @@ static void video_real_increase_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 6770 "VideoSupport.c"
 		}
-		__finally514:
+		__finally516:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6822,7 +6822,7 @@ static void video_real_decrease_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 6820 "VideoSupport.c"
 		}
-		__finally515:
+		__finally517:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7036,7 +7036,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			return;
 #line 7034 "VideoSupport.c"
 		}
-		__finally516:
+		__finally518:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7115,7 +7115,7 @@ static gchar* video_real_to_string (DataObject* base) {
 			return result;
 #line 7113 "VideoSupport.c"
 		}
-		__finally517:
+		__finally519:
 		{
 			VideoRow* _tmp11_ = NULL;
 #line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7169,7 +7169,7 @@ void video_get_video_id (Video* self, VideoID* result) {
 			return;
 #line 7167 "VideoSupport.c"
 		}
-		__finally518:
+		__finally520:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7225,7 +7225,7 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			return result;
 #line 7223 "VideoSupport.c"
 		}
-		__finally519:
+		__finally521:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7286,11 +7286,11 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7285 "VideoSupport.c"
-					goto __catch521_g_error;
+					goto __catch523_g_error;
 				}
 			}
-			goto __finally521;
-			__catch521_g_error:
+			goto __finally523;
+			__catch523_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
@@ -7309,7 +7309,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				_g_error_free0 (e);
 #line 7307 "VideoSupport.c"
 			}
-			__finally521:
+			__finally523:
 #line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7312 "VideoSupport.c"
@@ -7337,7 +7337,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp9_->exposure_time = _tmp10_;
 #line 7335 "VideoSupport.c"
 		}
-		__finally520:
+		__finally522:
 		{
 			VideoRow* _tmp11_ = NULL;
 #line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7412,7 +7412,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			return;
 #line 7410 "VideoSupport.c"
 		}
-		__finally522:
+		__finally524:
 		{
 			VideoRow* _tmp7_ = NULL;
 #line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7499,7 +7499,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			return result;
 #line 7497 "VideoSupport.c"
 		}
-		__finally523:
+		__finally525:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7555,7 +7555,7 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			return result;
 #line 7553 "VideoSupport.c"
 		}
-		__finally524:
+		__finally526:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7658,7 +7658,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 #line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7657 "VideoSupport.c"
-					goto __finally526;
+					goto __finally528;
 				}
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
@@ -7670,7 +7670,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_tmp14_->timestamp = (time_t) _tmp16_;
 #line 7668 "VideoSupport.c"
 			}
-			__finally526:
+			__finally528:
 			{
 				VideoRow* _tmp17_ = NULL;
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7684,7 +7684,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7683 "VideoSupport.c"
-					goto __catch525_database_error;
+					goto __catch527_database_error;
 				}
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7696,8 +7696,8 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 			}
 		}
 	}
-	goto __finally525;
-	__catch525_database_error:
+	goto __finally527;
+	__catch527_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -7715,7 +7715,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 		return;
 #line 7713 "VideoSupport.c"
 	}
-	__finally525:
+	__finally527:
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7776,7 +7776,7 @@ gchar* video_get_filename (Video* self) {
 			return result;
 #line 7774 "VideoSupport.c"
 		}
-		__finally527:
+		__finally529:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7918,7 +7918,7 @@ gdouble video_get_clip_duration (Video* self) {
 			return result;
 #line 7916 "VideoSupport.c"
 		}
-		__finally528:
+		__finally530:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7973,7 +7973,7 @@ gboolean video_get_is_interpretable (Video* self) {
 			return result;
 #line 7971 "VideoSupport.c"
 		}
-		__finally529:
+		__finally531:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8040,7 +8040,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			_tmp5_->is_interpretable = _tmp6_;
 #line 8038 "VideoSupport.c"
 		}
-		__finally530:
+		__finally532:
 		{
 			VideoRow* _tmp7_ = NULL;
 #line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8082,7 +8082,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8081 "VideoSupport.c"
-				goto __catch531_database_error;
+				goto __catch533_database_error;
 			}
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8093,8 +8093,8 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 #line 8090 "VideoSupport.c"
 		}
 	}
-	goto __finally531;
-	__catch531_database_error:
+	goto __finally533;
+	__catch533_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
@@ -8110,7 +8110,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		_g_error_free0 (e);
 #line 8108 "VideoSupport.c"
 	}
-	__finally531:
+	__finally533:
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8186,7 +8186,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 #line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 8185 "VideoSupport.c"
-				goto __catch532_video_error;
+				goto __catch534_video_error;
 			}
 #line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
@@ -8214,8 +8214,8 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		preview_frame = _tmp9_;
 #line 8212 "VideoSupport.c"
 	}
-	goto __finally532;
-	__catch532_video_error:
+	goto __finally534;
+	__catch534_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
@@ -8247,7 +8247,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		return result;
 #line 8245 "VideoSupport.c"
 	}
-	__finally532:
+	__finally534:
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8322,7 +8322,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			_tmp21_->clip_duration = _tmp22_;
 #line 8320 "VideoSupport.c"
 		}
-		__finally533:
+		__finally535:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8411,7 +8411,7 @@ static void video_real_destroy (DataSource* base) {
 #line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8410 "VideoSupport.c"
-				goto __catch534_database_error;
+				goto __catch536_database_error;
 			}
 #line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8422,8 +8422,8 @@ static void video_real_destroy (DataSource* base) {
 #line 8419 "VideoSupport.c"
 		}
 	}
-	goto __finally534;
-	__catch534_database_error:
+	goto __finally536;
+	__catch536_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
@@ -8444,7 +8444,7 @@ static void video_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 8442 "VideoSupport.c"
 	}
-	__finally534:
+	__finally536:
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8638,7 +8638,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 #line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8637 "VideoSupport.c"
-						goto __catch536_database_error;
+						goto __catch538_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
@@ -8657,8 +8657,8 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 #line 8654 "VideoSupport.c"
 				}
 			}
-			goto __finally536;
-			__catch536_database_error:
+			goto __finally538;
+			__catch538_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
@@ -8693,7 +8693,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 				return result;
 #line 8691 "VideoSupport.c"
 			}
-			__finally536:
+			__finally538:
 #line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8696 "VideoSupport.c"
@@ -8721,7 +8721,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			_tmp21_->flags = _tmp22_;
 #line 8719 "VideoSupport.c"
 		}
-		__finally535:
+		__finally537:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8842,7 +8842,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 #line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8841 "VideoSupport.c"
-						goto __catch538_database_error;
+						goto __catch540_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
@@ -8861,8 +8861,8 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 #line 8858 "VideoSupport.c"
 				}
 			}
-			goto __finally538;
-			__catch538_database_error:
+			goto __finally540;
+			__catch540_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
@@ -8897,7 +8897,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 				return result;
 #line 8895 "VideoSupport.c"
 			}
-			__finally538:
+			__finally540:
 #line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8900 "VideoSupport.c"
@@ -8925,7 +8925,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			_tmp21_->flags = _tmp22_;
 #line 8923 "VideoSupport.c"
 		}
-		__finally537:
+		__finally539:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8998,7 +8998,7 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 			return result;
 #line 8996 "VideoSupport.c"
 		}
-		__finally539:
+		__finally541:
 		{
 			VideoRow* _tmp6_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9120,7 +9120,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9119 "VideoSupport.c"
-					goto __finally541;
+					goto __finally543;
 				}
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
@@ -9134,7 +9134,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_tmp15_->filepath = _tmp17_;
 #line 9132 "VideoSupport.c"
 			}
-			__finally541:
+			__finally543:
 			{
 				VideoRow* _tmp18_ = NULL;
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9148,7 +9148,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9147 "VideoSupport.c"
-					goto __catch540_database_error;
+					goto __catch542_database_error;
 				}
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
@@ -9164,8 +9164,8 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 			}
 		}
 	}
-	goto __finally540;
-	__catch540_database_error:
+	goto __finally542;
+	__catch542_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -9187,7 +9187,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		return;
 #line 9185 "VideoSupport.c"
 	}
-	__finally540:
+	__finally542:
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9357,7 +9357,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9356 "VideoSupport.c"
-				goto __catch542_g_error;
+				goto __catch544_g_error;
 			}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
@@ -9368,7 +9368,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9367 "VideoSupport.c"
-				goto __catch542_g_error;
+				goto __catch544_g_error;
 			}
 #line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
@@ -9376,8 +9376,8 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 9374 "VideoSupport.c"
 		}
-		goto __finally542;
-		__catch542_g_error:
+		goto __finally544;
+		__catch544_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9407,7 +9407,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_error_free0 (err);
 #line 9405 "VideoSupport.c"
 		}
-		__finally542:
+		__finally544:
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"