New upstream version 0.25.2upstream/0.25.2

1 files changed, 116 insertions, 116 deletions

diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index b3620b3..f1d6f07 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.34.2, the Vala compiler
+/* VideoMetadata.c generated by valac 0.32.1, the Vala compiler
  * generated from VideoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -746,7 +746,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 749 "VideoMetadata.c"
-			goto __catch573_g_error;
+			goto __catch571_g_error;
 		}
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = test;
@@ -755,7 +755,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 758 "VideoMetadata.c"
-			goto __catch573_g_error;
+			goto __catch571_g_error;
 		}
 #line 84 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = test;
@@ -809,7 +809,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 812 "VideoMetadata.c"
-					goto __catch573_g_error;
+					goto __catch571_g_error;
 				}
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp13_ = test;
@@ -818,7 +818,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "VideoMetadata.c"
-					goto __catch573_g_error;
+					goto __catch571_g_error;
 				}
 #line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp14_ = test;
@@ -833,8 +833,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 			}
 		}
 	}
-	goto __finally573;
-	__catch573_g_error:
+	goto __finally571;
+	__catch571_g_error:
 	{
 		GError* e = NULL;
 		GFile* _tmp16_ = NULL;
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 866 "VideoMetadata.c"
 	}
-	__finally573:
+	__finally571:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -887,11 +887,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 889 "VideoMetadata.c"
-			goto __catch574_g_error;
+			goto __catch572_g_error;
 		}
 	}
-	goto __finally574;
-	__catch574_g_error:
+	goto __finally572;
+	__catch572_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -910,7 +910,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 911 "VideoMetadata.c"
 	}
-	__finally574:
+	__finally572:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -963,7 +963,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 965 "VideoMetadata.c"
-			goto __catch575_g_error;
+			goto __catch573_g_error;
 		}
 #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		done = FALSE;
@@ -994,7 +994,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "VideoMetadata.c"
-				goto __catch575_g_error;
+				goto __catch573_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = test;
@@ -1058,7 +1058,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1060 "VideoMetadata.c"
-						goto __catch575_g_error;
+						goto __catch573_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp16_ = child;
@@ -1114,7 +1114,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1116 "VideoMetadata.c"
-							goto __catch575_g_error;
+							goto __catch573_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp26_ = child;
@@ -1127,7 +1127,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1129 "VideoMetadata.c"
-							goto __catch575_g_error;
+							goto __catch573_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1146,7 +1146,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1148 "VideoMetadata.c"
-						goto __catch575_g_error;
+						goto __catch573_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1160,12 +1160,12 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1162 "VideoMetadata.c"
-				goto __catch575_g_error;
+				goto __catch573_g_error;
 			}
 		}
 	}
-	goto __finally575;
-	__catch575_g_error:
+	goto __finally573;
+	__catch573_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp30_ = NULL;
@@ -1184,7 +1184,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1185 "VideoMetadata.c"
 	}
-	__finally575:
+	__finally573:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1206,11 +1206,11 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1208 "VideoMetadata.c"
-			goto __catch576_g_error;
+			goto __catch574_g_error;
 		}
 	}
-	goto __finally576;
-	__catch576_g_error:
+	goto __finally574;
+	__catch574_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp33_ = NULL;
@@ -1229,7 +1229,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1230 "VideoMetadata.c"
 	}
-	__finally576:
+	__finally574:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1631,7 +1631,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 #line 1631 "VideoMetadata.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->input);
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1670,7 +1670,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1836,15 +1836,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1849 "VideoMetadata.c"
 }
@@ -2142,7 +2142,7 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = skip_amount;
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2602,7 +2602,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2604 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch575_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -2611,7 +2611,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2613 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch575_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = chunk;
@@ -2640,7 +2640,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2642 "VideoMetadata.c"
-				goto __catch577_g_error;
+				goto __catch575_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp12_ = _tmp9_;
@@ -2667,8 +2667,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 2667 "VideoMetadata.c"
 		}
 	}
-	goto __finally577;
-	__catch577_g_error:
+	goto __finally575;
+	__catch575_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -2687,7 +2687,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2688 "VideoMetadata.c"
 	}
-	__finally577:
+	__finally575:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2709,11 +2709,11 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2711 "VideoMetadata.c"
-			goto __catch578_g_error;
+			goto __catch576_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally576;
+	__catch576_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp17_ = NULL;
@@ -2732,7 +2732,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2733 "VideoMetadata.c"
 	}
-	__finally578:
+	__finally576:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2951,37 +2951,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2966 "VideoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2974 "VideoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2986 "VideoMetadata.c"
 	}
@@ -3001,112 +3001,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 3010 "VideoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 3016 "VideoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 3020 "VideoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 3024 "VideoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 3036 "VideoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 3046 "VideoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 3052 "VideoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 3066 "VideoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 3076 "VideoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 3082 "VideoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 3091 "VideoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3111 "VideoMetadata.c"
 }
@@ -4023,19 +4023,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 4040 "VideoMetadata.c"
 }
@@ -4073,7 +4073,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4075 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch577_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -4082,7 +4082,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch577_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -4093,7 +4093,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4095 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch577_g_error;
 		}
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
@@ -4122,8 +4122,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_free0 (sdate);
 #line 4123 "VideoMetadata.c"
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp11_ = NULL;
@@ -4142,7 +4142,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4143 "VideoMetadata.c"
 	}
-	__finally579:
+	__finally577:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4164,11 +4164,11 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4166 "VideoMetadata.c"
-			goto __catch580_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -4187,7 +4187,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4188 "VideoMetadata.c"
 	}
-	__finally580:
+	__finally578:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4575,7 +4575,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
 #line 4575 "VideoMetadata.c"
 	}
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->input);
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4614,7 +4614,7 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) {
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4643,7 +4643,7 @@ void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** er
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = skip_amount;
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4671,7 +4671,7 @@ void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp2_ = skip_amount;
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), _tmp2_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), _tmp2_, &_inner_error_);
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"