summaryrefslogtreecommitdiff
path: root/src/MediaInterfaces.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
commitcd16e7b4a394b6ce885a618d8a96eccd662208bb (patch)
treec9bcd713dbea9467783f8d82c63218af91192da1 /src/MediaInterfaces.c
parentb1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff)
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/MediaInterfaces.c')
-rw-r--r--src/MediaInterfaces.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 019cddc..ba3f229 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.32.1, the Vala compiler
* generated from MediaInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -293,11 +293,11 @@ void transaction_controller_begin (TransactionController* self) {
#line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 296 "MediaInterfaces.c"
- goto __catch570_g_error;
+ goto __catch568_g_error;
}
}
- goto __finally570;
- __catch570_g_error:
+ goto __finally568;
+ __catch568_g_error:
{
GError* err = NULL;
gint _tmp3_ = 0;
@@ -344,7 +344,7 @@ void transaction_controller_begin (TransactionController* self) {
_g_error_free0 (err);
#line 346 "MediaInterfaces.c"
}
- __finally570:
+ __finally568:
#line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 351 "MediaInterfaces.c"
@@ -365,7 +365,7 @@ void transaction_controller_begin (TransactionController* self) {
#line 366 "MediaInterfaces.c"
}
}
- __finally569:
+ __finally567:
{
gint _tmp11_ = 0;
#line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -453,11 +453,11 @@ void transaction_controller_commit (TransactionController* self) {
#line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 456 "MediaInterfaces.c"
- goto __catch572_g_error;
+ goto __catch570_g_error;
}
}
- goto __finally572;
- __catch572_g_error:
+ goto __finally570;
+ __catch570_g_error:
{
GError* err = NULL;
GError* _tmp5_ = NULL;
@@ -499,7 +499,7 @@ void transaction_controller_commit (TransactionController* self) {
_g_error_free0 (err);
#line 501 "MediaInterfaces.c"
}
- __finally572:
+ __finally570:
#line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 506 "MediaInterfaces.c"
@@ -520,7 +520,7 @@ void transaction_controller_commit (TransactionController* self) {
#line 521 "MediaInterfaces.c"
}
}
- __finally571:
+ __finally569:
{
gint _tmp12_ = 0;
#line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -792,7 +792,7 @@ static void transaction_controller_finalize (TransactionController* obj) {
_vala_assert (_tmp1_ == 0, "count == 0");
#line 794 "MediaInterfaces.c"
}
- __finally568:
+ __finally566:
{
gint _tmp2_ = 0;
#line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"