diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
| commit | f39ea21098340bd99c48669f152c9068046c2c99 (patch) | |
| tree | d1166fce1a4a8c470dfaf364816f767678c4729e /src/photos/GdkSupport.c | |
| parent | bc48a4cff815ed156b603c92e684779c317417ba (diff) | |
| parent | a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff) | |
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/photos/GdkSupport.c')
| -rw-r--r-- | src/photos/GdkSupport.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 010572b..b9e36c1 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.32.1, the Vala compiler +/* GdkSupport.c generated by valac 0.34.4, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -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 __catch28_g_error; + goto __catch30_g_error; } } - goto __finally28; - __catch28_g_error: + goto __finally30; + __catch30_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" } - __finally28: + __finally30: #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" @@ -930,7 +930,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp47__length1 = buffer_length1; #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_); + _tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_); #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" bytes_read = (gsize) _tmp48_; #line 75 "/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 __catch29_g_error; + goto __catch31_g_error; } } - goto __finally29; - __catch29_g_error: + goto __finally31; + __catch31_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" } - __finally29: + __finally31: #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" @@ -1127,7 +1127,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp69_ = fins; #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" |