summaryrefslogtreecommitdiff
path: root/src/Tombstone.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/Tombstone.c
parentb1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff)
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/Tombstone.c')
-rw-r--r--src/Tombstone.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/Tombstone.c b/src/Tombstone.c
index e9904b5..cad1972 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.34.2, the Vala compiler
+/* Tombstone.c generated by valac 0.32.1, the Vala compiler
* generated from Tombstone.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1320,7 +1320,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
#line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 1323 "Tombstone.c"
- goto __catch545_database_error;
+ goto __catch543_database_error;
}
#line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (marker);
@@ -1333,8 +1333,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
#line 1334 "Tombstone.c"
}
}
- goto __finally545;
- __catch545_database_error:
+ goto __finally543;
+ __catch543_database_error:
{
GError* err = NULL;
GError* _tmp2_ = NULL;
@@ -1350,7 +1350,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
_g_error_free0 (err);
#line 1352 "Tombstone.c"
}
- __finally545:
+ __finally543:
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1636,7 +1636,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 1639 "Tombstone.c"
- goto __catch546_g_error;
+ goto __catch544_g_error;
}
#line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->_tmp22_ = NULL;
@@ -1652,8 +1652,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_g_object_unref0 (_data_->_tmp18_);
#line 1654 "Tombstone.c"
}
- goto __finally546;
- __catch546_g_error:
+ goto __finally544;
+ __catch544_g_error:
{
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->err = _data_->_inner_error_;
@@ -1716,7 +1716,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_g_error_free0 (_data_->err);
#line 1717 "Tombstone.c"
}
- __finally546:
+ __finally544:
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1818,7 +1818,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_data_->_inner_error_->domain == DATABASE_ERROR) {
#line 1820 "Tombstone.c"
- goto __catch547_database_error;
+ goto __catch545_database_error;
}
#line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
_g_object_unref0 (_data_->marker);
@@ -1831,8 +1831,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
#line 1831 "Tombstone.c"
}
}
- goto __finally547;
- __catch547_database_error:
+ goto __finally545;
+ __catch545_database_error:
{
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
_data_->err2 = _data_->_inner_error_;
@@ -1848,7 +1848,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
_g_error_free0 (_data_->err2);
#line 1849 "Tombstone.c"
}
- __finally547:
+ __finally545:
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
#line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1904,7 +1904,7 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection
#line 7 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self);
#line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
- _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
self->priv->file_map = _tmp0_;
#line 1910 "Tombstone.c"
@@ -2374,7 +2374,7 @@ void tombstone_init (void) {
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 2376 "Tombstone.c"
- goto __catch548_database_error;
+ goto __catch546_database_error;
}
#line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2406,8 +2406,8 @@ void tombstone_init (void) {
_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
#line 2407 "Tombstone.c"
}
- goto __finally548;
- __catch548_database_error:
+ goto __finally546;
+ __catch546_database_error:
{
GError* err = NULL;
GError* _tmp8_ = NULL;
@@ -2423,7 +2423,7 @@ void tombstone_init (void) {
_g_error_free0 (err);
#line 2424 "Tombstone.c"
}
- __finally548:
+ __finally546:
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3210,7 +3210,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3212 "Tombstone.c"
- goto __catch549_database_error;
+ goto __catch547_database_error;
}
#line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3221,8 +3221,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
#line 3221 "Tombstone.c"
}
}
- goto __finally549;
- __catch549_database_error:
+ goto __finally547;
+ __catch547_database_error:
{
GError* err = NULL;
GError* _tmp7_ = NULL;
@@ -3238,7 +3238,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
_g_error_free0 (err);
#line 3239 "Tombstone.c"
}
- __finally549:
+ __finally547:
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3457,7 +3457,7 @@ static void tombstone_real_destroy (DataSource* base) {
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3459 "Tombstone.c"
- goto __catch550_database_error;
+ goto __catch548_database_error;
}
#line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3468,8 +3468,8 @@ static void tombstone_real_destroy (DataSource* base) {
#line 3468 "Tombstone.c"
}
}
- goto __finally550;
- __catch550_database_error:
+ goto __finally548;
+ __catch548_database_error:
{
GError* err = NULL;
GError* _tmp4_ = NULL;
@@ -3485,7 +3485,7 @@ static void tombstone_real_destroy (DataSource* base) {
_g_error_free0 (err);
#line 3486 "Tombstone.c"
}
- __finally550:
+ __finally548:
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"