summaryrefslogtreecommitdiff
path: root/src/Tag.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
commit49120f48474fc8fdc2448c75d961bc238213cfac (patch)
tree05bcdb95d65a807cf0f1ffffd066c09074b5cf56 /src/Tag.c
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
New upstream version 0.28.2upstream/0.28.2
Diffstat (limited to 'src/Tag.c')
-rw-r--r--src/Tag.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/Tag.c b/src/Tag.c
index 5f27dfc..b1d3895 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -923,7 +923,7 @@ GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
#define DEFAULT_USER_TEXT_INPUT_LENGTH 1024
gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add127 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add128 (gchar** * array, int* length, int* size, gchar* value);
static void tag_set_raw_flat_name (Tag* self, const gchar* name);
void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error);
void data_object_notify_altered (DataObject* self, Alteration* alteration);
@@ -3240,7 +3240,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
#line 393 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3243 "Tag.c"
- goto __catch471_database_error;
+ goto __catch480_database_error;
}
#line 393 "/home/jens/Source/shotwell/src/Tag.vala"
_g_object_unref0 (rows);
@@ -3264,8 +3264,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
_g_object_unref0 (_tmp1_);
#line 3266 "Tag.c"
}
- goto __finally471;
- __catch471_database_error:
+ goto __finally480;
+ __catch480_database_error:
{
GError* err = NULL;
GError* _tmp7_;
@@ -3281,7 +3281,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
_g_error_free0 (err);
#line 3283 "Tag.c"
}
- __finally471:
+ __finally480:
#line 392 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 392 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3423,7 +3423,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
#line 418 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 3426 "Tag.c"
- goto __catch472_database_error;
+ goto __catch481_database_error;
}
#line 418 "/home/jens/Source/shotwell/src/Tag.vala"
_g_free0 (name);
@@ -3444,8 +3444,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
#line 3445 "Tag.c"
}
}
- goto __finally472;
- __catch472_database_error:
+ goto __finally481;
+ __catch481_database_error:
{
GError* err = NULL;
TagRow* _tmp30_;
@@ -3470,7 +3470,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
_g_error_free0 (err);
#line 3472 "Tag.c"
}
- __finally472:
+ __finally481:
#line 417 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 417 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4577,7 +4577,7 @@ Tag* tag_for_path (const gchar* name) {
#line 563 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 4580 "Tag.c"
- goto __catch473_database_error;
+ goto __catch482_database_error;
}
#line 563 "/home/jens/Source/shotwell/src/Tag.vala"
_g_object_unref0 (tag);
@@ -4599,8 +4599,8 @@ Tag* tag_for_path (const gchar* name) {
_tag_row_unref0 (_tmp8_);
#line 4601 "Tag.c"
}
- goto __finally473;
- __catch473_database_error:
+ goto __finally482;
+ __catch482_database_error:
{
GError* err = NULL;
GError* _tmp15_;
@@ -4616,7 +4616,7 @@ Tag* tag_for_path (const gchar* name) {
_g_error_free0 (err);
#line 4618 "Tag.c"
}
- __finally473:
+ __finally482:
#line 562 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5336,7 +5336,7 @@ gchar* tag_prep_tag_name (const gchar* name) {
}
-static void _vala_array_add127 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add128 (gchar** * array, int* length, int* size, gchar* value) {
#line 665 "/home/jens/Source/shotwell/src/Tag.vala"
if ((*length) == (*size)) {
#line 665 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5446,7 +5446,7 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length
#line 665 "/home/jens/Source/shotwell/src/Tag.vala"
_tmp12_ = g_strdup (_tmp11_);
#line 665 "/home/jens/Source/shotwell/src/Tag.vala"
- _vala_array_add127 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+ _vala_array_add128 (&_result_, &_result__length1, &__result__size_, _tmp12_);
#line 5451 "Tag.c"
}
#line 662 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5532,7 +5532,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
#line 678 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5535 "Tag.c"
- goto __catch474_database_error;
+ goto __catch483_database_error;
}
#line 678 "/home/jens/Source/shotwell/src/Tag.vala"
_g_free0 (prepped_name);
@@ -5545,8 +5545,8 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
#line 5546 "Tag.c"
}
}
- goto __finally474;
- __catch474_database_error:
+ goto __finally483;
+ __catch483_database_error:
{
GError* err = NULL;
GError* _tmp10_;
@@ -5566,7 +5566,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
return;
#line 5568 "Tag.c"
}
- __finally474:
+ __finally483:
#line 677 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 677 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5678,7 +5678,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
#line 700 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5681 "Tag.c"
- goto __catch475_database_error;
+ goto __catch484_database_error;
}
#line 700 "/home/jens/Source/shotwell/src/Tag.vala"
_g_free0 (prepped_path);
@@ -5691,8 +5691,8 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
#line 5692 "Tag.c"
}
}
- goto __finally475;
- __catch475_database_error:
+ goto __finally484;
+ __catch484_database_error:
{
GError* err = NULL;
GError* _tmp13_;
@@ -5712,7 +5712,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
return;
#line 5714 "Tag.c"
}
- __finally475:
+ __finally484:
#line 699 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7066,7 +7066,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
#line 900 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 7069 "Tag.c"
- goto __catch476_database_error;
+ goto __catch485_database_error;
}
#line 900 "/home/jens/Source/shotwell/src/Tag.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);
@@ -7082,8 +7082,8 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
_tmp6_->tag_id = _tmp0_;
#line 7084 "Tag.c"
}
- goto __finally476;
- __catch476_database_error:
+ goto __finally485;
+ __catch485_database_error:
{
GError* err = NULL;
GError* _tmp7_;
@@ -7099,7 +7099,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
_g_error_free0 (err);
#line 7101 "Tag.c"
}
- __finally476:
+ __finally485:
#line 899 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9013,7 +9013,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
#line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 9016 "Tag.c"
- goto __catch477_database_error;
+ goto __catch486_database_error;
}
#line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
_g_object_unref0 (removed_sources);
@@ -9028,8 +9028,8 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
#line 9029 "Tag.c"
}
}
- goto __finally477;
- __catch477_database_error:
+ goto __finally486;
+ __catch486_database_error:
{
GError* err = NULL;
GError* _tmp57_;
@@ -9045,7 +9045,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
_g_error_free0 (err);
#line 9047 "Tag.c"
}
- __finally477:
+ __finally486:
#line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9257,7 +9257,7 @@ static void tag_real_destroy (DataSource* base) {
#line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 9260 "Tag.c"
- goto __catch478_database_error;
+ goto __catch487_database_error;
}
#line 1194 "/home/jens/Source/shotwell/src/Tag.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);
@@ -9268,8 +9268,8 @@ static void tag_real_destroy (DataSource* base) {
#line 9269 "Tag.c"
}
}
- goto __finally478;
- __catch478_database_error:
+ goto __finally487;
+ __catch487_database_error:
{
GError* err = NULL;
GError* _tmp19_;
@@ -9285,7 +9285,7 @@ static void tag_real_destroy (DataSource* base) {
_g_error_free0 (err);
#line 9287 "Tag.c"
}
- __finally478:
+ __finally487:
#line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1193 "/home/jens/Source/shotwell/src/Tag.vala"