summaryrefslogtreecommitdiff
path: root/src/searches/SearchBoolean.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /src/searches/SearchBoolean.c
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/searches/SearchBoolean.c')
-rw-r--r--src/searches/SearchBoolean.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 7da26c1..eea8d74 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.32.1, the Vala compiler
+/* SearchBoolean.c generated by valac 0.34.4, the Vala compiler
* generated from SearchBoolean.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2305,17 +2305,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2320 "SearchBoolean.c"
}
@@ -5691,7 +5691,7 @@ void saved_search_reconstitute (SavedSearch* self) {
#line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5684 "SearchBoolean.c"
- goto __catch74_database_error;
+ goto __catch76_database_error;
}
#line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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);
@@ -5707,8 +5707,8 @@ void saved_search_reconstitute (SavedSearch* self) {
_tmp6_->search_id = _tmp0_;
#line 5699 "SearchBoolean.c"
}
- goto __finally74;
- __catch74_database_error:
+ goto __finally76;
+ __catch76_database_error:
{
GError* err = NULL;
GError* _tmp7_ = NULL;
@@ -5724,7 +5724,7 @@ void saved_search_reconstitute (SavedSearch* self) {
_g_error_free0 (err);
#line 5716 "SearchBoolean.c"
}
- __finally74:
+ __finally76:
#line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5835,7 +5835,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
#line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5828 "SearchBoolean.c"
- goto __catch75_database_error;
+ goto __catch77_database_error;
}
#line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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);
@@ -5846,8 +5846,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
#line 5837 "SearchBoolean.c"
}
}
- goto __finally75;
- __catch75_database_error:
+ goto __finally77;
+ __catch77_database_error:
{
GError* err = NULL;
GError* _tmp12_ = NULL;
@@ -5867,7 +5867,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
return result;
#line 5859 "SearchBoolean.c"
}
- __finally75:
+ __finally77:
#line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6041,7 +6041,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
#line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 6034 "SearchBoolean.c"
- goto __catch76_database_error;
+ goto __catch78_database_error;
}
#line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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);
@@ -6132,8 +6132,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
_g_object_unref0 (_tmp0_);
#line 6124 "SearchBoolean.c"
}
- goto __finally76;
- __catch76_database_error:
+ goto __finally78;
+ __catch78_database_error:
{
GError* err = NULL;
GError* _tmp18_ = NULL;
@@ -6149,7 +6149,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
_g_error_free0 (err);
#line 6141 "SearchBoolean.c"
}
- __finally76:
+ __finally78:
#line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6282,7 +6282,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 6275 "SearchBoolean.c"
- goto __catch77_database_error;
+ goto __catch79_database_error;
}
#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
_g_object_unref0 (search);
@@ -6304,8 +6304,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
_saved_search_row_unref0 (_tmp0_);
#line 6296 "SearchBoolean.c"
}
- goto __finally77;
- __catch77_database_error:
+ goto __finally79;
+ __catch79_database_error:
{
GError* err = NULL;
GError* _tmp9_ = NULL;
@@ -6321,7 +6321,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
_g_error_free0 (err);
#line 6313 "SearchBoolean.c"
}
- __finally77:
+ __finally79:
#line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6386,7 +6386,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
#line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 6379 "SearchBoolean.c"
- goto __catch78_database_error;
+ goto __catch80_database_error;
}
#line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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);
@@ -6397,8 +6397,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
#line 6388 "SearchBoolean.c"
}
}
- goto __finally78;
- __catch78_database_error:
+ goto __finally80;
+ __catch80_database_error:
{
GError* err = NULL;
GError* _tmp4_ = NULL;
@@ -6414,7 +6414,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
_g_error_free0 (err);
#line 6406 "SearchBoolean.c"
}
- __finally78:
+ __finally80:
#line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"