summaryrefslogtreecommitdiff
path: root/src/MediaMonitor.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-22 06:40:44 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-22 06:40:44 +0100
commit8e1c5a834469d804d28ee8ab2cbe2da8e600a789 (patch)
treeb9771456583eaead893cfd8f02e680b58a3da970 /src/MediaMonitor.c
parent80a5f2d8b095e895a5424f90b2ce4684d94c1a32 (diff)
parent3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff)
Merge tag 'upstream/0.26.0'
Upstream version 0.26.0
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 f741331..f723c0f 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -2853,7 +2853,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 2856 "MediaMonitor.c"
- goto __catch581_g_error;
+ goto __catch583_g_error;
}
#line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp39_ = controller;
@@ -2861,8 +2861,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
transaction_controller_commit (_tmp39_);
#line 2863 "MediaMonitor.c"
}
- goto __finally581;
- __catch581_g_error:
+ goto __finally583;
+ __catch583_g_error:
{
GError* err = NULL;
GError* _tmp40_ = NULL;
@@ -2907,7 +2907,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_g_error_free0 (err);
#line 2909 "MediaMonitor.c"
}
- __finally581:
+ __finally583:
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"