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/Tombstone.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/Tombstone.c') diff --git a/src/Tombstone.c b/src/Tombstone.c index 7c57055..0f09e21 100644 --- a/src/Tombstone.c +++ b/src/Tombstone.c @@ -1323,7 +1323,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 1326 "Tombstone.c" - goto __catch548_database_error; + goto __catch557_database_error; } #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (marker); @@ -1336,8 +1336,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self #line 1337 "Tombstone.c" } } - goto __finally548; - __catch548_database_error: + goto __finally557; + __catch557_database_error: { GError* err = NULL; GError* _tmp2_; @@ -1353,7 +1353,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self _g_error_free0 (err); #line 1355 "Tombstone.c" } - __finally548: + __finally557: #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1628,7 +1628,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 1631 "Tombstone.c" - goto __catch549_g_error; + goto __catch558_g_error; } #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->_tmp22_ = _data_->_tmp18_; @@ -1642,8 +1642,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_object_unref0 (_data_->_tmp18_); #line 1644 "Tombstone.c" } - goto __finally549; - __catch549_g_error: + goto __finally558; + __catch558_g_error: { #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->err = _data_->_inner_error_; @@ -1692,7 +1692,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_error_free0 (_data_->err); #line 1693 "Tombstone.c" } - __finally549: + __finally558: #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -1780,7 +1780,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_data_->_inner_error_->domain == DATABASE_ERROR) { #line 1782 "Tombstone.c" - goto __catch550_database_error; + goto __catch559_database_error; } #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala" _g_object_unref0 (_data_->marker); @@ -1795,8 +1795,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec #line 1795 "Tombstone.c" } } - goto __finally550; - __catch550_database_error: + goto __finally559; + __catch559_database_error: { #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" _data_->err2 = _data_->_inner_error_; @@ -1810,7 +1810,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec _g_error_free0 (_data_->err2); #line 1811 "Tombstone.c" } - __finally550: + __finally559: #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -2339,7 +2339,7 @@ void tombstone_init (void) { #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 2341 "Tombstone.c" - goto __catch551_database_error; + goto __catch560_database_error; } #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala" rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL); @@ -2371,8 +2371,8 @@ void tombstone_init (void) { _tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL); #line 2372 "Tombstone.c" } - goto __finally551; - __catch551_database_error: + goto __finally560; + __catch560_database_error: { GError* err = NULL; GError* _tmp8_; @@ -2388,7 +2388,7 @@ void tombstone_init (void) { _g_error_free0 (err); #line 2389 "Tombstone.c" } - __finally551: + __finally560: #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3175,7 +3175,7 @@ void tombstone_move (Tombstone* self, GFile* file) { #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 3177 "Tombstone.c" - goto __catch552_database_error; + goto __catch561_database_error; } #line 297 "/home/jens/Source/shotwell/src/Tombstone.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); @@ -3186,8 +3186,8 @@ void tombstone_move (Tombstone* self, GFile* file) { #line 3186 "Tombstone.c" } } - goto __finally552; - __catch552_database_error: + goto __finally561; + __catch561_database_error: { GError* err = NULL; GError* _tmp7_; @@ -3203,7 +3203,7 @@ void tombstone_move (Tombstone* self, GFile* file) { _g_error_free0 (err); #line 3204 "Tombstone.c" } - __finally552: + __finally561: #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala" @@ -3422,7 +3422,7 @@ static void tombstone_real_destroy (DataSource* base) { #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 3424 "Tombstone.c" - goto __catch553_database_error; + goto __catch562_database_error; } #line 328 "/home/jens/Source/shotwell/src/Tombstone.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); @@ -3433,8 +3433,8 @@ static void tombstone_real_destroy (DataSource* base) { #line 3433 "Tombstone.c" } } - goto __finally553; - __catch553_database_error: + goto __finally562; + __catch562_database_error: { GError* err = NULL; GError* _tmp4_; @@ -3450,7 +3450,7 @@ static void tombstone_real_destroy (DataSource* base) { _g_error_free0 (err); #line 3451 "Tombstone.c" } - __finally553: + __finally562: #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala" -- cgit v1.2.3