From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/Event.c | 64 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src/Event.c') diff --git a/src/Event.c b/src/Event.c index c427644..984004e 100644 --- a/src/Event.c +++ b/src/Event.c @@ -3757,7 +3757,7 @@ Event* event_create_empty_event (MediaSource* source) { #line 476 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 3760 "Event.c" - goto __catch436_database_error; + goto __catch444_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); @@ -3795,8 +3795,8 @@ Event* event_create_empty_event (MediaSource* source) { return result; #line 3797 "Event.c" } - goto __finally436; - __catch436_database_error: + goto __finally444; + __catch444_database_error: { GError* err = NULL; GError* _tmp14_; @@ -3816,7 +3816,7 @@ Event* event_create_empty_event (MediaSource* source) { return result; #line 3818 "Event.c" } - __finally436: + __finally444: #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" @@ -4025,11 +4025,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 4028 "Event.c" - goto __catch437_g_error; + goto __catch445_g_error; } } - goto __finally437; - __catch437_g_error: + goto __finally445; + __catch445_g_error: { GError* err = NULL; GError* _tmp6_; @@ -4056,7 +4056,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so _g_error_free0 (err); #line 4058 "Event.c" } - __finally437: + __finally445: #line 525 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 525 "/home/jens/Source/shotwell/src/Event.vala" @@ -4086,11 +4086,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 4089 "Event.c" - goto __catch438_g_error; + goto __catch446_g_error; } } - goto __finally438; - __catch438_g_error: + goto __finally446; + __catch446_g_error: { GError* err = NULL; GError* _tmp13_; @@ -4117,7 +4117,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so _g_error_free0 (err); #line 4119 "Event.c" } - __finally438: + __finally446: #line 531 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 531 "/home/jens/Source/shotwell/src/Event.vala" @@ -4203,11 +4203,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 4206 "Event.c" - goto __catch439_g_error; + goto __catch447_g_error; } } - goto __finally439; - __catch439_g_error: + goto __finally447; + __catch447_g_error: { GError* err = NULL; GError* _tmp6_; @@ -4234,7 +4234,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection _g_error_free0 (err); #line 4236 "Event.c" } - __finally439: + __finally447: #line 555 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 555 "/home/jens/Source/shotwell/src/Event.vala" @@ -4264,11 +4264,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 4267 "Event.c" - goto __catch440_g_error; + goto __catch448_g_error; } } - goto __finally440; - __catch440_g_error: + goto __finally448; + __catch448_g_error: { GError* err = NULL; GError* _tmp13_; @@ -4295,7 +4295,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection _g_error_free0 (err); #line 4297 "Event.c" } - __finally440: + __finally448: #line 561 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 561 "/home/jens/Source/shotwell/src/Event.vala" @@ -5329,7 +5329,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 5331 "Event.c" - goto __catch441_database_error; + goto __catch449_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); @@ -5386,8 +5386,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s return result; #line 5387 "Event.c" } - goto __finally441; - __catch441_database_error: + goto __finally449; + __catch449_database_error: { GError* err = NULL; GError* _tmp49_; @@ -5403,7 +5403,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s _g_error_free0 (err); #line 5404 "Event.c" } - __finally441: + __finally449: #line 657 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 657 "/home/jens/Source/shotwell/src/Event.vala" @@ -6906,7 +6906,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 6908 "Event.c" - goto __catch442_g_error; + goto __catch450_g_error; } #line 903 "/home/jens/Source/shotwell/src/Event.vala" _tmp6_ = _tmp0_; @@ -6920,8 +6920,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { return result; #line 6921 "Event.c" } - goto __finally442; - __catch442_g_error: + goto __finally450; + __catch450_g_error: { GError* err = NULL; #line 902 "/home/jens/Source/shotwell/src/Event.vala" @@ -6936,7 +6936,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { return result; #line 6937 "Event.c" } - __finally442: + __finally450: #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" @@ -6978,7 +6978,7 @@ static void event_real_destroy (DataSource* base) { #line 915 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 6980 "Event.c" - goto __catch443_database_error; + goto __catch451_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); @@ -6989,8 +6989,8 @@ static void event_real_destroy (DataSource* base) { #line 6989 "Event.c" } } - goto __finally443; - __catch443_database_error: + goto __finally451; + __catch451_database_error: { GError* err = NULL; GError* _tmp3_; @@ -7006,7 +7006,7 @@ static void event_real_destroy (DataSource* base) { _g_error_free0 (err); #line 7007 "Event.c" } - __finally443: + __finally451: #line 914 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 914 "/home/jens/Source/shotwell/src/Event.vala" -- cgit v1.2.3