summaryrefslogtreecommitdiff
path: root/src/Upgrades.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
commitccff5442184e84d511c2bd25ed3da53e4336a272 (patch)
tree8402a0ba68852e0aec5841ed4519ccfe88352223 /src/Upgrades.c
parenta1e1833f48ed618273dab9198b547148a89832a7 (diff)
parent4a3f1fdfe1eb3743564adcee35d5513224339260 (diff)
Merge tag 'upstream/0.25.1'
Upstream version 0.25.1
Diffstat (limited to 'src/Upgrades.c')
-rw-r--r--src/Upgrades.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Upgrades.c b/src/Upgrades.c
index f55ebcc..ed5a4de 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 __catch594_g_error;
+ goto __catch591_g_error;
}
#line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
self->priv->num_mimics = _tmp0_;
#line 1131 "Upgrades.c"
}
- goto __finally594;
- __catch594_g_error:
+ goto __finally591;
+ __catch591_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"
}
- __finally594:
+ __finally591:
#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 __catch595_g_error;
+ goto __catch592_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 __catch595_g_error;
+ goto __catch592_g_error;
}
}
- goto __finally595;
- __catch595_g_error:
+ goto __finally592;
+ __catch592_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"
}
- __finally595:
+ __finally592:
#line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"