diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-29 23:25:59 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-29 23:25:59 +0200 |
| commit | 6944ad9f9346341ee0fd120ec3ed0b7b56406436 (patch) | |
| tree | ae59422da384a9463c306e1983be5ac46ff97c7d /src/Upgrades.c | |
| parent | 803e11e1c311a7ba4923d8d438eafa7ff62b463d (diff) | |
| parent | 72e3d4c55a6569d966059f762824c38d06055871 (diff) | |
Merge tag 'upstream/0.25.0'
Upstream version 0.25.0
Diffstat (limited to 'src/Upgrades.c')
| -rw-r--r-- | src/Upgrades.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Upgrades.c b/src/Upgrades.c index 420cc7c..9d41ad1 100644 --- a/src/Upgrades.c +++ b/src/Upgrades.c @@ -1123,14 +1123,14 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1126 "Upgrades.c" - goto __catch581_g_error; + goto __catch594_g_error; } #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala" self->priv->num_mimics = _tmp0_; #line 1131 "Upgrades.c" } - goto __finally581; - __catch581_g_error: + goto __finally594; + __catch594_g_error: { GError* e = NULL; GError* _tmp3_ = NULL; @@ -1149,7 +1149,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) { _g_error_free0 (e); #line 1151 "Upgrades.c" } - __finally581: + __finally594: #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala" @@ -1195,7 +1195,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1198 "Upgrades.c" - goto __catch582_g_error; + goto __catch595_g_error; } #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" _tmp3_ = self->priv->mimic_dir; @@ -1204,11 +1204,11 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1207 "Upgrades.c" - goto __catch582_g_error; + goto __catch595_g_error; } } - goto __finally582; - __catch582_g_error: + goto __finally595; + __catch595_g_error: { GError* e = NULL; GError* _tmp4_ = NULL; @@ -1227,7 +1227,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor _g_error_free0 (e); #line 1229 "Upgrades.c" } - __finally582: + __finally595: #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala" |