summaryrefslogtreecommitdiff
path: root/src/MediaMonitor.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
commit2b3f22361da0c1d8e6ce70d71352821758186db7 (patch)
tree5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/MediaMonitor.c
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parentdc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/MediaMonitor.c')
-rw-r--r--src/MediaMonitor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index b06e19e..91da70c 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -2860,7 +2860,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
#line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2863 "MediaMonitor.c"
- goto __catch585_g_error;
+ goto __catch594_g_error;
}
#line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp39_ = controller;
@@ -2868,8 +2868,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
transaction_controller_commit (_tmp39_);
#line 2870 "MediaMonitor.c"
}
- goto __finally585;
- __catch585_g_error:
+ goto __finally594;
+ __catch594_g_error:
{
GError* err = NULL;
GError* _tmp40_;
@@ -2911,7 +2911,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_g_error_free0 (err);
#line 2913 "MediaMonitor.c"
}
- __finally585:
+ __finally594:
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2918 "MediaMonitor.c"