diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
| commit | 8e1c5a834469d804d28ee8ab2cbe2da8e600a789 (patch) | |
| tree | b9771456583eaead893cfd8f02e680b58a3da970 /src/Exporter.c | |
| parent | 80a5f2d8b095e895a5424f90b2ce4684d94c1a32 (diff) | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
Merge tag 'upstream/0.26.0'
Upstream version 0.26.0
Diffstat (limited to 'src/Exporter.c')
| -rw-r--r-- | src/Exporter.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Exporter.c b/src/Exporter.c index 3f7a625..bc4c3b1 100644 --- a/src/Exporter.c +++ b/src/Exporter.c @@ -1480,7 +1480,7 @@ static gboolean exporter_process_queue (Exporter* self) { #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1483 "Exporter.c" - goto __catch477_g_error; + goto __catch478_g_error; } #line 230 "/home/jens/Source/shotwell/src/Exporter.vala" _tmp43_ = _tmp36_; @@ -1494,8 +1494,8 @@ static gboolean exporter_process_queue (Exporter* self) { _g_object_unref0 (_tmp36_); #line 1496 "Exporter.c" } - goto __finally477; - __catch477_g_error: + goto __finally478; + __catch478_g_error: { GError* err = NULL; const gchar* _tmp44_ = NULL; @@ -1556,7 +1556,7 @@ static gboolean exporter_process_queue (Exporter* self) { break; #line 1558 "Exporter.c" } - __finally477: + __finally478: #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 228 "/home/jens/Source/shotwell/src/Exporter.vala" @@ -2054,7 +2054,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { #line 97 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2057 "Exporter.c" - goto __catch478_g_error; + goto __catch479_g_error; } } else { MediaSource* _tmp9_ = NULL; @@ -2074,13 +2074,13 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { #line 99 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2077 "Exporter.c" - goto __catch478_g_error; + goto __catch479_g_error; } } } } - goto __finally478; - __catch478_g_error: + goto __finally479; + __catch479_g_error: { GError* err = NULL; GError* _tmp12_ = NULL; @@ -2101,7 +2101,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) { _g_error_free0 (err); #line 2103 "Exporter.c" } - __finally478: + __finally479: #line 95 "/home/jens/Source/shotwell/src/Exporter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 95 "/home/jens/Source/shotwell/src/Exporter.vala" |