Merge branch 'feature/upstream' into develop

1 files changed, 26 insertions, 26 deletions

diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index a32204d..12966d0 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -748,10 +748,10 @@ enum  {
 };
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
 void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
-static gint __lambda12_ (void* a, void* b);
+static gint __lambda13_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
-static gint ___lambda12____compar_fn_t (void* key1, void* key2);
+static gint ___lambda13____compar_fn_t (void* key1, void* key2);
 gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
 SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
 gboolean search_condition_predicate (SearchCondition* self, MediaSource* source);
@@ -1162,7 +1162,7 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
 }
 
 
-static gint __lambda12_ (void* a, void* b) {
+static gint __lambda13_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_;
 	gchar* _tmp1_;
@@ -1187,9 +1187,9 @@ static gint __lambda12_ (void* a, void* b) {
 }
 
 
-static gint ___lambda12____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda13____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda12_ (key1, key2);
+	result = __lambda13_ (key1, key2);
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
 #line 1196 "SearchBoolean.c"
@@ -1210,7 +1210,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp1__length1 = *array_length1;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t);
+	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t);
 #line 1215 "SearchBoolean.c"
 }
 
@@ -5665,7 +5665,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5658 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch86_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);
@@ -5681,8 +5681,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5673 "SearchBoolean.c"
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally86;
+	__catch86_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -5698,7 +5698,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5690 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally86:
 #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"
@@ -5811,7 +5811,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 5804 "SearchBoolean.c"
-				goto __catch79_database_error;
+				goto __catch87_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);
@@ -5822,8 +5822,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5813 "SearchBoolean.c"
 		}
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally87;
+	__catch87_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -5843,7 +5843,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5835 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally87:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5840 "SearchBoolean.c"
@@ -6019,7 +6019,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 6012 "SearchBoolean.c"
-				goto __catch80_database_error;
+				goto __catch88_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);
@@ -6108,8 +6108,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6100 "SearchBoolean.c"
 	}
-	goto __finally80;
-	__catch80_database_error:
+	goto __finally88;
+	__catch88_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_;
@@ -6125,7 +6125,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6117 "SearchBoolean.c"
 	}
-	__finally80:
+	__finally88:
 #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"
@@ -6258,7 +6258,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 6251 "SearchBoolean.c"
-				goto __catch81_database_error;
+				goto __catch89_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6280,8 +6280,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6272 "SearchBoolean.c"
 	}
-	goto __finally81;
-	__catch81_database_error:
+	goto __finally89;
+	__catch89_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -6297,7 +6297,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6289 "SearchBoolean.c"
 	}
-	__finally81:
+	__finally89:
 #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"
@@ -6362,7 +6362,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 6355 "SearchBoolean.c"
-				goto __catch82_database_error;
+				goto __catch90_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);
@@ -6373,8 +6373,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6364 "SearchBoolean.c"
 		}
 	}
-	goto __finally82;
-	__catch82_database_error:
+	goto __finally90;
+	__catch90_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -6390,7 +6390,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6382 "SearchBoolean.c"
 	}
-	__finally82:
+	__finally90:
 #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"