Merge tag 'upstream/0.24.1'

Upstream version 0.24.1

1 files changed, 22 insertions, 22 deletions

diff --git a/src/util/misc.c b/src/util/misc.c
index b8101f1..282f51f 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.32.1, the Vala compiler
+/* misc.c generated by valac 0.34.1, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -687,7 +687,7 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6__length1 = buffer_length1;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
-			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
+			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			bytes_read = (gsize) _tmp7_;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -730,7 +730,7 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 737 "misc.c"
@@ -1971,35 +1971,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 2005 "misc.c"
 }
@@ -3095,13 +3095,13 @@ void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, cons
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
 #line 3107 "misc.c"
 }