diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
| commit | 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch) | |
| tree | 496b2f3899e1d5728ee9ae76095cc5056c317447 /src/db/SavedSearchDBTable.c | |
| parent | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff) | |
| parent | 5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff) | |
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'src/db/SavedSearchDBTable.c')
| -rw-r--r-- | src/db/SavedSearchDBTable.c | 3731 |
1 files changed, 1793 insertions, 1938 deletions
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index bedc8f4..d2d20d2 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.36.6, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.40.4, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <string.h> @@ -301,52 +302,76 @@ GType saved_search_id_get_type (void) G_GNUC_CONST; SavedSearchID* saved_search_id_dup (const SavedSearchID* self); void saved_search_id_free (SavedSearchID* self); #define SAVED_SEARCH_ID_INVALID ((gint64) -1) -void saved_search_id_init (SavedSearchID *self, gint64 id); +void saved_search_id_init (SavedSearchID *self, + gint64 id); gboolean saved_search_id_is_invalid (SavedSearchID *self); gboolean saved_search_id_is_valid (SavedSearchID *self); gpointer saved_search_row_ref (gpointer instance); void saved_search_row_unref (gpointer instance); -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_row (GValue* value, gpointer v_object); -void value_take_saved_search_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_saved_search_row (GValue* value, + gpointer v_object); +void value_take_saved_search_row (GValue* value, + gpointer v_object); gpointer value_get_saved_search_row (const GValue* value); GType saved_search_row_get_type (void) G_GNUC_CONST; GType search_operator_get_type (void) G_GNUC_CONST; gpointer search_condition_ref (gpointer instance); void search_condition_unref (gpointer instance); -GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_search_condition (GValue* value, gpointer v_object); -void value_take_search_condition (GValue* value, gpointer v_object); +GParamSpec* param_spec_search_condition (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_search_condition (GValue* value, + gpointer v_object); +void value_take_search_condition (GValue* value, + gpointer v_object); gpointer value_get_search_condition (const GValue* value); GType search_condition_get_type (void) G_GNUC_CONST; -enum { - SAVED_SEARCH_ROW_DUMMY_PROPERTY -}; SavedSearchRow* saved_search_row_new (void); SavedSearchRow* saved_search_row_construct (GType object_type); static void saved_search_row_finalize (SavedSearchRow * obj); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType saved_search_db_table_get_type (void) G_GNUC_CONST; -enum { - SAVED_SEARCH_DB_TABLE_DUMMY_PROPERTY -}; static SavedSearchDBTable* saved_search_db_table_new (void); static SavedSearchDBTable* saved_search_db_table_construct (GType object_type); DatabaseTable* database_table_construct (GType object_type); -void database_table_set_table_name (DatabaseTable* self, const gchar* table_name); -void database_table_fatal (const gchar* op, gint res); +void database_table_set_table_name (DatabaseTable* self, + const gchar* table_name); +void database_table_fatal (const gchar* op, + gint res); SavedSearchDBTable* saved_search_db_table_get_instance (void); GQuark database_error_quark (void); -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error); +SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error); gchar* search_operator_to_string (SearchOperator self); -void database_table_throw_error (const gchar* method, gint res, GError** error); -static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error); +void database_table_throw_error (const gchar* method, + gint res, + GError** error); +static void saved_search_db_table_add_condition (SavedSearchDBTable* self, + SavedSearchID* id, + SearchCondition* condition, + GError** error); GType search_condition_text_get_type (void) G_GNUC_CONST; GType search_condition_search_type_get_type (void) G_GNUC_CONST; SearchConditionSearchType search_condition_get_search_type (SearchCondition* self); @@ -386,55 +411,111 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat gchar* search_condition_date_context_to_string (SearchConditionDateContext self); GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); -static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); -static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error); -static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); +static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, + const gchar* table_name, + SavedSearchID* search_id, + GError** error); +static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); SearchConditionSearchType search_condition_search_type_from_string (const gchar* str); SearchConditionTextContext search_condition_text_context_from_string (const gchar* str); -SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); -SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context); +SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); +SearchConditionText* search_condition_text_construct (GType object_type, + SearchConditionSearchType search_type, + const gchar* text, + SearchConditionTextContext context); SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str); SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str); -SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); -SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); +SearchConditionMediaType* search_condition_media_type_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionMediaTypeContext context, + SearchConditionMediaTypeMediaType media_type); SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str); -SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state); -SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, + SearchConditionFlaggedState state); +SearchConditionFlagged* search_condition_flagged_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionFlaggedState state); SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str); SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str); -SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); -SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); +SearchConditionModified* search_condition_modified_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionModifiedContext context, + SearchConditionModifiedState state); Rating rating_unserialize (gint value); SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str); -SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); -SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); +SearchConditionRating* search_condition_rating_construct (GType object_type, + SearchConditionSearchType search_type, + Rating rating, + SearchConditionRatingContext context); SearchConditionDateContext search_condition_date_context_from_string (const gchar* str); -SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two); -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error); -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); -void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error); -SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error); +SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +SearchConditionDate* search_condition_date_construct (GType object_type, + SearchConditionSearchType search_type, + SearchConditionDateContext context, + GDateTime* date_one, + GDateTime* date_two); +void saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error); +void saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); +void database_table_delete_by_id (DatabaseTable* self, + gint64 id, + GError** error); +SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error); SearchOperator search_operator_from_string (const gchar* str); -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error); -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error); -void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const gchar* column, const gchar* text, GError** error); +GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error); +void saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error); +void database_table_update_text_by_id_2 (DatabaseTable* self, + gint64 id, + const gchar* column, + const gchar* text, + GError** error); static void saved_search_db_table_finalize (DatabaseTable * obj); -void saved_search_id_init (SavedSearchID *self, gint64 id) { - gint64 _tmp0_; +void +saved_search_id_init (SavedSearchID *self, + gint64 id) +{ #line 12 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" memset (self, 0, sizeof (SavedSearchID)); #line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = id; -#line 13 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - (*self).id = _tmp0_; -#line 434 "SavedSearchDBTable.c" + (*self).id = id; +#line 513 "SavedSearchDBTable.c" } -gboolean saved_search_id_is_invalid (SavedSearchID *self) { +gboolean +saved_search_id_is_invalid (SavedSearchID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -443,11 +524,13 @@ gboolean saved_search_id_is_invalid (SavedSearchID *self) { result = _tmp0_ == SAVED_SEARCH_ID_INVALID; #line 17 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 447 "SavedSearchDBTable.c" +#line 528 "SavedSearchDBTable.c" } -gboolean saved_search_id_is_valid (SavedSearchID *self) { +gboolean +saved_search_id_is_valid (SavedSearchID *self) +{ gboolean result = FALSE; gint64 _tmp0_; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -456,11 +539,13 @@ gboolean saved_search_id_is_valid (SavedSearchID *self) { result = _tmp0_ != SAVED_SEARCH_ID_INVALID; #line 21 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 460 "SavedSearchDBTable.c" +#line 543 "SavedSearchDBTable.c" } -SavedSearchID* saved_search_id_dup (const SavedSearchID* self) { +SavedSearchID* +saved_search_id_dup (const SavedSearchID* self) +{ SavedSearchID* dup; #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dup = g_new0 (SavedSearchID, 1); @@ -468,18 +553,22 @@ SavedSearchID* saved_search_id_dup (const SavedSearchID* self) { memcpy (dup, self, sizeof (SavedSearchID)); #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return dup; -#line 472 "SavedSearchDBTable.c" +#line 557 "SavedSearchDBTable.c" } -void saved_search_id_free (SavedSearchID* self) { +void +saved_search_id_free (SavedSearchID* self) +{ #line 7 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_free (self); -#line 479 "SavedSearchDBTable.c" +#line 566 "SavedSearchDBTable.c" } -GType saved_search_id_get_type (void) { +GType +saved_search_id_get_type (void) +{ static volatile gsize saved_search_id_type_id__volatile = 0; if (g_once_init_enter (&saved_search_id_type_id__volatile)) { GType saved_search_id_type_id; @@ -490,121 +579,150 @@ GType saved_search_id_get_type (void) { } -SavedSearchRow* saved_search_row_construct (GType object_type) { +SavedSearchRow* +saved_search_row_construct (GType object_type) +{ SavedSearchRow* self = NULL; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchRow*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self; -#line 500 "SavedSearchDBTable.c" +#line 591 "SavedSearchDBTable.c" } -SavedSearchRow* saved_search_row_new (void) { +SavedSearchRow* +saved_search_row_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return saved_search_row_construct (TYPE_SAVED_SEARCH_ROW); -#line 507 "SavedSearchDBTable.c" +#line 600 "SavedSearchDBTable.c" } -static void value_saved_search_row_init (GValue* value) { +static void +value_saved_search_row_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 514 "SavedSearchDBTable.c" +#line 609 "SavedSearchDBTable.c" } -static void value_saved_search_row_free_value (GValue* value) { +static void +value_saved_search_row_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (value->data[0].v_pointer); -#line 523 "SavedSearchDBTable.c" +#line 620 "SavedSearchDBTable.c" } } -static void value_saved_search_row_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_saved_search_row_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dest_value->data[0].v_pointer = saved_search_row_ref (src_value->data[0].v_pointer); -#line 533 "SavedSearchDBTable.c" +#line 633 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" dest_value->data[0].v_pointer = NULL; -#line 537 "SavedSearchDBTable.c" +#line 637 "SavedSearchDBTable.c" } } -static gpointer value_saved_search_row_peek_pointer (const GValue* value) { +static gpointer +value_saved_search_row_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return value->data[0].v_pointer; -#line 545 "SavedSearchDBTable.c" +#line 647 "SavedSearchDBTable.c" } -static gchar* value_saved_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_row_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (collect_values[0].v_pointer) { -#line 552 "SavedSearchDBTable.c" +#line 659 "SavedSearchDBTable.c" SavedSearchRow * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 559 "SavedSearchDBTable.c" +#line 666 "SavedSearchDBTable.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 563 "SavedSearchDBTable.c" +#line 670 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = saved_search_row_ref (object); -#line 567 "SavedSearchDBTable.c" +#line 674 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 571 "SavedSearchDBTable.c" +#line 678 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 575 "SavedSearchDBTable.c" +#line 682 "SavedSearchDBTable.c" } -static gchar* value_saved_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_saved_search_row_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ SavedSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 586 "SavedSearchDBTable.c" +#line 698 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = NULL; -#line 592 "SavedSearchDBTable.c" +#line 704 "SavedSearchDBTable.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = value->data[0].v_pointer; -#line 596 "SavedSearchDBTable.c" +#line 708 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *object_p = saved_search_row_ref (value->data[0].v_pointer); -#line 600 "SavedSearchDBTable.c" +#line 712 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 604 "SavedSearchDBTable.c" +#line 716 "SavedSearchDBTable.c" } -GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_saved_search_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecSavedSearchRow* spec; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_ROW), NULL); @@ -614,20 +732,25 @@ GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return G_PARAM_SPEC (spec); -#line 618 "SavedSearchDBTable.c" +#line 736 "SavedSearchDBTable.c" } -gpointer value_get_saved_search_row (const GValue* value) { +gpointer +value_get_saved_search_row (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW), NULL); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return value->data[0].v_pointer; -#line 627 "SavedSearchDBTable.c" +#line 747 "SavedSearchDBTable.c" } -void value_set_saved_search_row (GValue* value, gpointer v_object) { +void +value_set_saved_search_row (GValue* value, + gpointer v_object) +{ SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); @@ -643,22 +766,25 @@ void value_set_saved_search_row (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_ref (value->data[0].v_pointer); -#line 647 "SavedSearchDBTable.c" +#line 770 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 651 "SavedSearchDBTable.c" +#line 774 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (old); -#line 657 "SavedSearchDBTable.c" +#line 780 "SavedSearchDBTable.c" } } -void value_take_saved_search_row (GValue* value, gpointer v_object) { +void +value_take_saved_search_row (GValue* value, + gpointer v_object) +{ SavedSearchRow * old; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_ROW)); @@ -672,38 +798,44 @@ void value_take_saved_search_row (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = v_object; -#line 676 "SavedSearchDBTable.c" +#line 802 "SavedSearchDBTable.c" } else { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" value->data[0].v_pointer = NULL; -#line 680 "SavedSearchDBTable.c" +#line 806 "SavedSearchDBTable.c" } #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_unref (old); -#line 686 "SavedSearchDBTable.c" +#line 812 "SavedSearchDBTable.c" } } -static void saved_search_row_class_init (SavedSearchRowClass * klass) { +static void +saved_search_row_class_init (SavedSearchRowClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_row_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" ((SavedSearchRowClass *) klass)->finalize = saved_search_row_finalize; -#line 696 "SavedSearchDBTable.c" +#line 824 "SavedSearchDBTable.c" } -static void saved_search_row_instance_init (SavedSearchRow * self) { +static void +saved_search_row_instance_init (SavedSearchRow * self) +{ #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self->ref_count = 1; -#line 703 "SavedSearchDBTable.c" +#line 833 "SavedSearchDBTable.c" } -static void saved_search_row_finalize (SavedSearchRow * obj) { +static void +saved_search_row_finalize (SavedSearchRow * obj) +{ SavedSearchRow * self; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_ROW, SavedSearchRow); @@ -713,11 +845,13 @@ static void saved_search_row_finalize (SavedSearchRow * obj) { _g_free0 (self->name); #line 30 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (self->conditions); -#line 717 "SavedSearchDBTable.c" +#line 849 "SavedSearchDBTable.c" } -GType saved_search_row_get_type (void) { +GType +saved_search_row_get_type (void) +{ static volatile gsize saved_search_row_type_id__volatile = 0; if (g_once_init_enter (&saved_search_row_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_saved_search_row_init, value_saved_search_row_free_value, value_saved_search_row_copy_value, value_saved_search_row_peek_pointer, "p", value_saved_search_row_collect_value, "p", value_saved_search_row_lcopy_value }; @@ -731,18 +865,22 @@ GType saved_search_row_get_type (void) { } -gpointer saved_search_row_ref (gpointer instance) { +gpointer +saved_search_row_ref (gpointer instance) +{ SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return instance; -#line 742 "SavedSearchDBTable.c" +#line 878 "SavedSearchDBTable.c" } -void saved_search_row_unref (gpointer instance) { +void +saved_search_row_unref (gpointer instance) +{ SavedSearchRow * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -751,12 +889,14 @@ void saved_search_row_unref (gpointer instance) { SAVED_SEARCH_ROW_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_type_free_instance ((GTypeInstance *) self); -#line 755 "SavedSearchDBTable.c" +#line 893 "SavedSearchDBTable.c" } } -static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { +static SavedSearchDBTable* +saved_search_db_table_construct (GType object_type) +{ SavedSearchDBTable* self = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -766,48 +906,47 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { gint _tmp3_; sqlite3_stmt* _tmp4_; gint _tmp5_; - gint _tmp6_; - sqlite3* _tmp8_; - sqlite3_stmt* _tmp9_ = NULL; + sqlite3* _tmp7_; + sqlite3_stmt* _tmp8_ = NULL; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - gint _tmp13_; - gint _tmp14_; - sqlite3* _tmp16_; - sqlite3_stmt* _tmp17_ = NULL; - gint _tmp18_; + sqlite3_stmt* _tmp11_; + gint _tmp12_; + sqlite3* _tmp14_; + sqlite3_stmt* _tmp15_ = NULL; + gint _tmp16_; + gint _tmp17_; + sqlite3_stmt* _tmp18_; gint _tmp19_; - sqlite3_stmt* _tmp20_; - gint _tmp21_; - gint _tmp22_; - sqlite3* _tmp24_; - sqlite3_stmt* _tmp25_ = NULL; + sqlite3* _tmp21_; + sqlite3_stmt* _tmp22_ = NULL; + gint _tmp23_; + gint _tmp24_; + sqlite3_stmt* _tmp25_; gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - gint _tmp29_; + sqlite3* _tmp28_; + sqlite3_stmt* _tmp29_ = NULL; gint _tmp30_; - sqlite3* _tmp32_; - sqlite3_stmt* _tmp33_ = NULL; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; + gint _tmp31_; + sqlite3_stmt* _tmp32_; + gint _tmp33_; + sqlite3* _tmp35_; + sqlite3_stmt* _tmp36_ = NULL; gint _tmp37_; gint _tmp38_; - sqlite3* _tmp40_; - sqlite3_stmt* _tmp41_ = NULL; - gint _tmp42_; - gint _tmp43_; - sqlite3_stmt* _tmp44_; + sqlite3_stmt* _tmp39_; + gint _tmp40_; + sqlite3* _tmp42_; + sqlite3_stmt* _tmp43_ = NULL; + gint _tmp44_; gint _tmp45_; - gint _tmp46_; - sqlite3* _tmp48_; - sqlite3_stmt* _tmp49_ = NULL; - gint _tmp50_; + sqlite3_stmt* _tmp46_; + gint _tmp47_; + sqlite3* _tmp49_; + sqlite3_stmt* _tmp50_ = NULL; gint _tmp51_; - sqlite3_stmt* _tmp52_; - gint _tmp53_; + gint _tmp52_; + sqlite3_stmt* _tmp53_; gint _tmp54_; sqlite3* _tmp56_; sqlite3_stmt* _tmp57_ = NULL; @@ -815,42 +954,30 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { gint _tmp59_; sqlite3_stmt* _tmp60_; gint _tmp61_; - gint _tmp62_; - sqlite3* _tmp64_; - sqlite3_stmt* _tmp65_ = NULL; + sqlite3* _tmp63_; + sqlite3_stmt* _tmp64_ = NULL; + gint _tmp65_; gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - gint _tmp69_; - gint _tmp70_; - sqlite3* _tmp72_; - sqlite3_stmt* _tmp73_ = NULL; - gint _tmp74_; + sqlite3_stmt* _tmp67_; + gint _tmp68_; + sqlite3* _tmp70_; + sqlite3_stmt* _tmp71_ = NULL; + gint _tmp72_; + gint _tmp73_; + sqlite3_stmt* _tmp74_; gint _tmp75_; - sqlite3_stmt* _tmp76_; - gint _tmp77_; - gint _tmp78_; - sqlite3* _tmp80_; - sqlite3_stmt* _tmp81_ = NULL; + sqlite3* _tmp77_; + sqlite3_stmt* _tmp78_ = NULL; + gint _tmp79_; + gint _tmp80_; + sqlite3_stmt* _tmp81_; gint _tmp82_; - gint _tmp83_; - sqlite3_stmt* _tmp84_; - gint _tmp85_; + sqlite3* _tmp84_; + sqlite3_stmt* _tmp85_ = NULL; gint _tmp86_; - sqlite3* _tmp88_; - sqlite3_stmt* _tmp89_ = NULL; - gint _tmp90_; - gint _tmp91_; - sqlite3_stmt* _tmp92_; - gint _tmp93_; - gint _tmp94_; - sqlite3* _tmp96_; - sqlite3_stmt* _tmp97_ = NULL; - gint _tmp98_; - gint _tmp99_; - sqlite3_stmt* _tmp100_; - gint _tmp101_; - gint _tmp102_; + gint _tmp87_; + sqlite3_stmt* _tmp88_; + gint _tmp89_; #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = (SavedSearchDBTable*) database_table_construct (object_type); #line 37 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -872,428 +999,408 @@ static SavedSearchDBTable* saved_search_db_table_construct (GType object_type) { #line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_step (_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp5_; + res = sqlite3_step (_tmp4_); #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = res; + _tmp5_ = res; #line 51 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp6_ != SQLITE_DONE) { -#line 883 "SavedSearchDBTable.c" - gint _tmp7_; + if (_tmp5_ != SQLITE_DONE) { +#line 1008 "SavedSearchDBTable.c" + gint _tmp6_; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 52 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable", _tmp7_); -#line 889 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable", _tmp6_); +#line 1014 "SavedSearchDBTable.c" } #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = database_table_db; + _tmp7_ = database_table_db; #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_prepare_v2 (_tmp8_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp9_, NULL); + _tmp9_ = sqlite3_prepare_v2 (_tmp7_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Text " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "text TEXT" ")", -1, &_tmp8_, NULL); #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp9_; + stmt = _tmp8_; #line 55 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = _tmp9_; #line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp10_ = res; #line 64 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); -#line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = sqlite3_step (_tmp12_); + _tmp11_ = stmt; #line 66 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp13_; + res = sqlite3_step (_tmp11_); #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 67 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp14_ != SQLITE_DONE) { -#line 915 "SavedSearchDBTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_DONE) { +#line 1038 "SavedSearchDBTable.c" + gint _tmp13_; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 68 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Text", _tmp15_); -#line 921 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Text", _tmp13_); +#line 1044 "SavedSearchDBTable.c" } #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = database_table_db; + _tmp14_ = database_table_db; #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = sqlite3_prepare_v2 (_tmp16_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp17_, NULL); + _tmp16_ = sqlite3_prepare_v2 (_tmp14_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_MediaType " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "type TEXT NOT_NULL" ")", -1, &_tmp15_, NULL); #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp17_; + stmt = _tmp15_; #line 71 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp18_; + res = _tmp16_; #line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp17_ = res; #line 80 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); -#line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); #line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = sqlite3_step (_tmp20_); + _tmp18_ = stmt; #line 82 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp21_; + res = sqlite3_step (_tmp18_); #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = res; + _tmp19_ = res; #line 83 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp22_ != SQLITE_DONE) { -#line 947 "SavedSearchDBTable.c" - gint _tmp23_; + if (_tmp19_ != SQLITE_DONE) { +#line 1068 "SavedSearchDBTable.c" + gint _tmp20_; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = res; + _tmp20_ = res; #line 84 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp23_); -#line 953 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_MediaType", _tmp20_); +#line 1074 "SavedSearchDBTable.c" } #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = database_table_db; + _tmp21_ = database_table_db; #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp25_, NULL); + _tmp23_ = sqlite3_prepare_v2 (_tmp21_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Flagged " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "flag_state TEXT NOT NULL" ")", -1, &_tmp22_, NULL); #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp25_; + stmt = _tmp22_; #line 87 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp26_; + res = _tmp23_; #line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = res; + _tmp24_ = res; #line 95 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK"); #line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = sqlite3_step (_tmp28_); + _tmp25_ = stmt; #line 97 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp29_; + res = sqlite3_step (_tmp25_); #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 98 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp30_ != SQLITE_DONE) { -#line 979 "SavedSearchDBTable.c" - gint _tmp31_; + if (_tmp26_ != SQLITE_DONE) { +#line 1098 "SavedSearchDBTable.c" + gint _tmp27_; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = res; + _tmp27_ = res; #line 99 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp31_); -#line 985 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Flagged", _tmp27_); +#line 1104 "SavedSearchDBTable.c" } #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = database_table_db; + _tmp28_ = database_table_db; #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp33_, NULL); + _tmp30_ = sqlite3_prepare_v2 (_tmp28_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Modified " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "modified_state TEXT NOT NULL" ")", -1, &_tmp29_, NULL); #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp33_; + stmt = _tmp29_; #line 102 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = _tmp30_; #line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp31_ = res; #line 111 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = stmt; + _vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK"); #line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); + _tmp32_ = stmt; #line 113 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp32_); #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = res; + _tmp33_ = res; #line 114 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1011 "SavedSearchDBTable.c" - gint _tmp39_; + if (_tmp33_ != SQLITE_DONE) { +#line 1128 "SavedSearchDBTable.c" + gint _tmp34_; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp34_ = res; #line 115 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Modified", _tmp39_); -#line 1017 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Modified", _tmp34_); +#line 1134 "SavedSearchDBTable.c" } #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = database_table_db; + _tmp35_ = database_table_db; #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp41_, NULL); + _tmp37_ = sqlite3_prepare_v2 (_tmp35_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Rating " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "rating INTEGER NOT_NULL, " "context TEXT NOT NULL" ")", -1, &_tmp36_, NULL); #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp41_; + stmt = _tmp36_; #line 118 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp42_; + res = _tmp37_; #line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = res; + _tmp38_ = res; #line 127 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK"); -#line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = stmt; + _vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK"); #line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sqlite3_step (_tmp44_); + _tmp39_ = stmt; #line 129 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp45_; + res = sqlite3_step (_tmp39_); #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = res; + _tmp40_ = res; #line 130 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp46_ != SQLITE_DONE) { -#line 1043 "SavedSearchDBTable.c" - gint _tmp47_; + if (_tmp40_ != SQLITE_DONE) { +#line 1158 "SavedSearchDBTable.c" + gint _tmp41_; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = res; + _tmp41_ = res; #line 131 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating", _tmp47_); -#line 1049 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating", _tmp41_); +#line 1164 "SavedSearchDBTable.c" } #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = database_table_db; + _tmp42_ = database_table_db; #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = sqlite3_prepare_v2 (_tmp48_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp49_, NULL); + _tmp44_ = sqlite3_prepare_v2 (_tmp42_, "CREATE TABLE IF NOT EXISTS " "SavedSearchDBTable_Date " "(" "id INTEGER PRIMARY KEY, " "search_id INTEGER NOT NULL, " "search_type TEXT NOT NULL, " "context TEXT NOT NULL, " "date_one INTEGER NOT_NULL, " "date_two INTEGER NOT_NULL" ")", -1, &_tmp43_, NULL); #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp49_; + stmt = _tmp43_; #line 134 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp50_; + res = _tmp44_; #line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = res; + _tmp45_ = res; #line 144 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); -#line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = stmt; + _vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK"); #line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = sqlite3_step (_tmp52_); + _tmp46_ = stmt; #line 146 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp53_; + res = sqlite3_step (_tmp46_); #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = res; + _tmp47_ = res; #line 147 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp54_ != SQLITE_DONE) { -#line 1075 "SavedSearchDBTable.c" - gint _tmp55_; + if (_tmp47_ != SQLITE_DONE) { +#line 1188 "SavedSearchDBTable.c" + gint _tmp48_; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp55_ = res; + _tmp48_ = res; #line 148 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating", _tmp55_); -#line 1081 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating", _tmp48_); +#line 1194 "SavedSearchDBTable.c" } #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = database_table_db; + _tmp49_ = database_table_db; #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp57_, NULL); + _tmp51_ = sqlite3_prepare_v2 (_tmp49_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Text_Index " "ON SavedSearchDBTable_Text(search_id)", -1, &_tmp50_, NULL); #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp57_; + stmt = _tmp50_; #line 151 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp58_; + res = _tmp51_; #line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = res; + _tmp52_ = res; #line 154 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK"); #line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = stmt; -#line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = sqlite3_step (_tmp60_); + _tmp53_ = stmt; #line 155 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp61_; + res = sqlite3_step (_tmp53_); #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = res; + _tmp54_ = res; #line 156 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp62_ != SQLITE_DONE) { -#line 1107 "SavedSearchDBTable.c" - gint _tmp63_; + if (_tmp54_ != SQLITE_DONE) { +#line 1218 "SavedSearchDBTable.c" + gint _tmp55_; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = res; + _tmp55_ = res; #line 157 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp63_); -#line 1113 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Text_Index", _tmp55_); +#line 1224 "SavedSearchDBTable.c" } #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = database_table_db; + _tmp56_ = database_table_db; #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = sqlite3_prepare_v2 (_tmp64_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp65_, NULL); + _tmp58_ = sqlite3_prepare_v2 (_tmp56_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_MediaType_Index " "ON SavedSearchDBTable_MediaType(search_id)", -1, &_tmp57_, NULL); #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp65_; + stmt = _tmp57_; #line 159 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp66_; + res = _tmp58_; #line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp59_ = res; #line 162 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); -#line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = stmt; + _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); #line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = sqlite3_step (_tmp68_); + _tmp60_ = stmt; #line 163 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp69_; + res = sqlite3_step (_tmp60_); #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = res; + _tmp61_ = res; #line 164 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp70_ != SQLITE_DONE) { -#line 1139 "SavedSearchDBTable.c" - gint _tmp71_; + if (_tmp61_ != SQLITE_DONE) { +#line 1248 "SavedSearchDBTable.c" + gint _tmp62_; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = res; + _tmp62_ = res; #line 165 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp71_); -#line 1145 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_MediaType_Index", _tmp62_); +#line 1254 "SavedSearchDBTable.c" } #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = database_table_db; + _tmp63_ = database_table_db; #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = sqlite3_prepare_v2 (_tmp72_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp73_, NULL); + _tmp65_ = sqlite3_prepare_v2 (_tmp63_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Flagged_Index " "ON SavedSearchDBTable_Flagged(search_id)", -1, &_tmp64_, NULL); #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp73_; + stmt = _tmp64_; #line 167 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp74_; + res = _tmp65_; #line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = res; + _tmp66_ = res; #line 170 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp66_ == SQLITE_OK, "res == Sqlite.OK"); #line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = sqlite3_step (_tmp76_); + _tmp67_ = stmt; #line 171 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp77_; + res = sqlite3_step (_tmp67_); #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = res; + _tmp68_ = res; #line 172 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp78_ != SQLITE_DONE) { -#line 1171 "SavedSearchDBTable.c" - gint _tmp79_; + if (_tmp68_ != SQLITE_DONE) { +#line 1278 "SavedSearchDBTable.c" + gint _tmp69_; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp79_ = res; + _tmp69_ = res; #line 173 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp79_); -#line 1177 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Flagged_Index", _tmp69_); +#line 1284 "SavedSearchDBTable.c" } #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = database_table_db; + _tmp70_ = database_table_db; #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = sqlite3_prepare_v2 (_tmp80_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp81_, NULL); + _tmp72_ = sqlite3_prepare_v2 (_tmp70_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Modified_Index " "ON SavedSearchDBTable_Modified(search_id)", -1, &_tmp71_, NULL); #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp81_; + stmt = _tmp71_; #line 175 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp82_; + res = _tmp72_; #line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = res; + _tmp73_ = res; #line 178 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp83_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp73_ == SQLITE_OK, "res == Sqlite.OK"); #line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp84_ = stmt; + _tmp74_ = stmt; #line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_step (_tmp84_); -#line 179 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = sqlite3_step (_tmp74_); #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp75_ = res; #line 180 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp86_ != SQLITE_DONE) { -#line 1203 "SavedSearchDBTable.c" - gint _tmp87_; + if (_tmp75_ != SQLITE_DONE) { +#line 1308 "SavedSearchDBTable.c" + gint _tmp76_; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = res; + _tmp76_ = res; #line 181 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp87_); -#line 1209 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Modified_Index", _tmp76_); +#line 1314 "SavedSearchDBTable.c" } #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = database_table_db; + _tmp77_ = database_table_db; #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = sqlite3_prepare_v2 (_tmp88_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp89_, NULL); + _tmp79_ = sqlite3_prepare_v2 (_tmp77_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Rating_Index " "ON SavedSearchDBTable_Rating(search_id)", -1, &_tmp78_, NULL); #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp89_; + stmt = _tmp78_; #line 183 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp90_; + res = _tmp79_; #line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp80_ = res; #line 186 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp91_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp80_ == SQLITE_OK, "res == Sqlite.OK"); #line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = stmt; + _tmp81_ = stmt; #line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = sqlite3_step (_tmp92_); -#line 187 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp93_; + res = sqlite3_step (_tmp81_); #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = res; + _tmp82_ = res; #line 188 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp94_ != SQLITE_DONE) { -#line 1235 "SavedSearchDBTable.c" - gint _tmp95_; + if (_tmp82_ != SQLITE_DONE) { +#line 1338 "SavedSearchDBTable.c" + gint _tmp83_; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = res; + _tmp83_ = res; #line 189 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp95_); -#line 1241 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Rating_Index", _tmp83_); +#line 1344 "SavedSearchDBTable.c" } #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = database_table_db; + _tmp84_ = database_table_db; #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = sqlite3_prepare_v2 (_tmp96_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp97_, NULL); + _tmp86_ = sqlite3_prepare_v2 (_tmp84_, "CREATE INDEX IF NOT EXISTS " "SavedSearchDBTable_Date_Index " "ON SavedSearchDBTable_Date(search_id)", -1, &_tmp85_, NULL); #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp97_; + stmt = _tmp85_; #line 191 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp98_; + res = _tmp86_; #line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = res; + _tmp87_ = res; #line 194 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); -#line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = stmt; + _vala_assert (_tmp87_ == SQLITE_OK, "res == Sqlite.OK"); #line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = sqlite3_step (_tmp100_); + _tmp88_ = stmt; #line 195 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp101_; + res = sqlite3_step (_tmp88_); #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = res; + _tmp89_ = res; #line 196 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp102_ != SQLITE_DONE) { -#line 1267 "SavedSearchDBTable.c" - gint _tmp103_; + if (_tmp89_ != SQLITE_DONE) { +#line 1368 "SavedSearchDBTable.c" + gint _tmp90_; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = res; + _tmp90_ = res; #line 197 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp103_); -#line 1273 "SavedSearchDBTable.c" + database_table_fatal ("create SavedSearchDBTable_Date_Index", _tmp90_); +#line 1374 "SavedSearchDBTable.c" } #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self; -#line 1279 "SavedSearchDBTable.c" +#line 1380 "SavedSearchDBTable.c" } -static SavedSearchDBTable* saved_search_db_table_new (void) { +static SavedSearchDBTable* +saved_search_db_table_new (void) +{ #line 36 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return saved_search_db_table_construct (TYPE_SAVED_SEARCH_DB_TABLE); -#line 1286 "SavedSearchDBTable.c" +#line 1389 "SavedSearchDBTable.c" } -static gpointer _database_table_ref0 (gpointer self) { +static gpointer +_database_table_ref0 (gpointer self) +{ #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? database_table_ref (self) : NULL; -#line 1293 "SavedSearchDBTable.c" +#line 1398 "SavedSearchDBTable.c" } -SavedSearchDBTable* saved_search_db_table_get_instance (void) { +SavedSearchDBTable* +saved_search_db_table_get_instance (void) +{ SavedSearchDBTable* result = NULL; SavedSearchDBTable* _tmp0_; SavedSearchDBTable* _tmp2_; @@ -1302,7 +1409,7 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { _tmp0_ = saved_search_db_table_instance; #line 201 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (_tmp0_ == NULL) { -#line 1306 "SavedSearchDBTable.c" +#line 1413 "SavedSearchDBTable.c" SavedSearchDBTable* _tmp1_; #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = saved_search_db_table_new (); @@ -1310,7 +1417,7 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { _database_table_unref0 (saved_search_db_table_instance); #line 202 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_db_table_instance = _tmp1_; -#line 1314 "SavedSearchDBTable.c" +#line 1421 "SavedSearchDBTable.c" } #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp2_ = saved_search_db_table_instance; @@ -1320,18 +1427,26 @@ SavedSearchDBTable* saved_search_db_table_get_instance (void) { result = _tmp3_; #line 204 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 1324 "SavedSearchDBTable.c" +#line 1431 "SavedSearchDBTable.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? g_object_ref (self) : NULL; -#line 1331 "SavedSearchDBTable.c" +#line 1440 "SavedSearchDBTable.c" } -SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error) { +SavedSearchRow* +saved_search_db_table_add (SavedSearchDBTable* self, + const gchar* name, + SearchOperator operator, + GeeArrayList* conditions, + GError** error) +{ SavedSearchRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -1340,33 +1455,24 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - GDestroyNotify _tmp7_; - gint _tmp8_; - gint _tmp9_; - sqlite3_stmt* _tmp10_; - SearchOperator _tmp11_; - gchar* _tmp12_; - GDestroyNotify _tmp13_; - gint _tmp14_; - gint _tmp15_; - sqlite3_stmt* _tmp16_; - gint _tmp17_; - gint _tmp18_; + gchar* _tmp5_; + GDestroyNotify _tmp6_; + gint _tmp7_; + sqlite3_stmt* _tmp8_; + gchar* _tmp9_; + GDestroyNotify _tmp10_; + gint _tmp11_; + sqlite3_stmt* _tmp12_; + gint _tmp13_; SavedSearchRow* row = NULL; + SavedSearchRow* _tmp15_; + SavedSearchRow* _tmp16_; + sqlite3* _tmp17_; + SavedSearchRow* _tmp18_; + gchar* _tmp19_; SavedSearchRow* _tmp20_; SavedSearchRow* _tmp21_; - sqlite3* _tmp22_; - gint64 _tmp23_; - SavedSearchRow* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - SavedSearchRow* _tmp27_; - SearchOperator _tmp28_; - SavedSearchRow* _tmp29_; - GeeArrayList* _tmp30_; - GeeList* _tmp31_; + GeeList* _tmp22_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -1391,51 +1497,41 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = name; -#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = g_strdup (_tmp5_); -#line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = g_free; + _tmp5_ = g_strdup (name); #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); + _tmp6_ = g_free; #line 214 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp8_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp5_, -1, _tmp6_); #line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp7_ = res; #line 215 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = stmt; -#line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = operator; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = search_operator_to_string (_tmp11_); + _tmp8_ = stmt; #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = g_free; + _tmp9_ = search_operator_to_string (operator); #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_bind_text (_tmp10_, 2, _tmp12_, -1, _tmp13_); + _tmp10_ = g_free; #line 216 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp14_; + res = sqlite3_bind_text (_tmp8_, 2, _tmp9_, -1, _tmp10_); #line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp11_ = res; #line 217 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); -#line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); #line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_step (_tmp16_); + _tmp12_ = stmt; #line 219 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp17_; + res = sqlite3_step (_tmp12_); #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = res; + _tmp13_ = res; #line 220 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp18_ != SQLITE_DONE) { -#line 1434 "SavedSearchDBTable.c" - gint _tmp19_; + if (_tmp13_ != SQLITE_DONE) { +#line 1530 "SavedSearchDBTable.c" + gint _tmp14_; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp14_ = res; #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.add", _tmp19_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.add", _tmp14_, &_inner_error_); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1446,7 +1542,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1450 "SavedSearchDBTable.c" +#line 1546 "SavedSearchDBTable.c" } else { #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -1456,117 +1552,106 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar g_clear_error (&_inner_error_); #line 221 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1460 "SavedSearchDBTable.c" +#line 1556 "SavedSearchDBTable.c" } } } #line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = saved_search_row_new (); + _tmp15_ = saved_search_row_new (); #line 223 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp20_; -#line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = row; + row = _tmp15_; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = database_table_db; + _tmp16_ = row; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_last_insert_rowid (_tmp22_); + _tmp17_ = database_table_db; #line 224 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&_tmp21_->search_id, _tmp23_); + saved_search_id_init (&_tmp16_->search_id, sqlite3_last_insert_rowid (_tmp17_)); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; + _tmp18_ = row; #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = name; + _tmp19_ = g_strdup (name); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = g_strdup (_tmp25_); + _g_free0 (_tmp18_->name); #line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp24_->name); -#line 225 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_->name = _tmp26_; -#line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = row; + _tmp18_->name = _tmp19_; #line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = operator; + _tmp20_ = row; #line 226 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_->operator = _tmp28_; -#line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = row; + _tmp20_->operator = operator; #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = conditions; + _tmp21_ = row; #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_LIST, GeeList)); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (conditions, GEE_TYPE_LIST, GeeList)); #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp29_->conditions); + _g_object_unref0 (_tmp21_->conditions); #line 227 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_->conditions = _tmp31_; -#line 1502 "SavedSearchDBTable.c" + _tmp21_->conditions = _tmp22_; +#line 1590 "SavedSearchDBTable.c" { GeeArrayList* _sc_list = NULL; - GeeArrayList* _tmp32_; - GeeArrayList* _tmp33_; + GeeArrayList* _tmp23_; gint _sc_size = 0; - GeeArrayList* _tmp34_; - gint _tmp35_; - gint _tmp36_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; gint _sc_index = 0; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = conditions; -#line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _g_object_ref0 (_tmp32_); + _tmp23_ = _g_object_ref0 (conditions); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_list = _tmp33_; + _sc_list = _tmp23_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = _sc_list; + _tmp24_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = _tmp35_; + _tmp26_ = _tmp25_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_size = _tmp36_; + _sc_size = _tmp26_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sc_index = -1; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 1530 "SavedSearchDBTable.c" - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; +#line 1615 "SavedSearchDBTable.c" + gint _tmp27_; + gint _tmp28_; + gint _tmp29_; SearchCondition* sc = NULL; - GeeArrayList* _tmp40_; - gint _tmp41_; - gpointer _tmp42_; - SavedSearchRow* _tmp43_; - SavedSearchID _tmp44_; - SearchCondition* _tmp45_; + GeeArrayList* _tmp30_; + gint _tmp31_; + gpointer _tmp32_; + SavedSearchRow* _tmp33_; + SavedSearchID _tmp34_; + SearchCondition* _tmp35_; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = _sc_index; + _tmp27_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_index = _tmp37_ + 1; + _sc_index = _tmp27_ + 1; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = _sc_index; + _tmp28_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = _sc_size; + _tmp29_ = _sc_size; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!(_tmp38_ < _tmp39_)) { + if (!(_tmp28_ < _tmp29_)) { #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 1553 "SavedSearchDBTable.c" +#line 1638 "SavedSearchDBTable.c" } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = _sc_list; + _tmp30_ = _sc_list; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = _sc_index; + _tmp31_ = _sc_index; #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp41_); + _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_); #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - sc = (SearchCondition*) _tmp42_; + sc = (SearchCondition*) _tmp32_; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = row; + _tmp33_ = row; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = _tmp43_->search_id; + _tmp34_ = _tmp33_->search_id; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sc; + _tmp35_ = sc; #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_db_table_add_condition (self, &_tmp44_, _tmp45_, &_inner_error_); + saved_search_db_table_add_condition (self, &_tmp34_, _tmp35_, &_inner_error_); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1583,7 +1668,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1587 "SavedSearchDBTable.c" +#line 1672 "SavedSearchDBTable.c" } else { #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); @@ -1599,16 +1684,16 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar g_clear_error (&_inner_error_); #line 230 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 1603 "SavedSearchDBTable.c" +#line 1688 "SavedSearchDBTable.c" } } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); -#line 1608 "SavedSearchDBTable.c" +#line 1693 "SavedSearchDBTable.c" } #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (_sc_list); -#line 1612 "SavedSearchDBTable.c" +#line 1697 "SavedSearchDBTable.c" } #line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = row; @@ -1616,19 +1701,25 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar _sqlite3_finalize0 (stmt); #line 233 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 1620 "SavedSearchDBTable.c" +#line 1705 "SavedSearchDBTable.c" } -static gpointer _search_condition_ref0 (gpointer self) { +static gpointer +_search_condition_ref0 (gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return self ? search_condition_ref (self) : NULL; -#line 1627 "SavedSearchDBTable.c" +#line 1714 "SavedSearchDBTable.c" } -static void saved_search_db_table_add_condition (SavedSearchDBTable* self, SavedSearchID* id, SearchCondition* condition, GError** error) { - SearchCondition* _tmp0_; +static void +saved_search_db_table_add_condition (SavedSearchDBTable* self, + SavedSearchID* id, + SearchCondition* condition, + GError** error) +{ GError * _inner_error_ = NULL; #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -1637,161 +1728,141 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved #line 236 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SEARCH_CONDITION (condition)); #line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp0_ = condition; -#line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT)) { -#line 1644 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT)) { +#line 1733 "SavedSearchDBTable.c" SearchConditionText* text = NULL; - SearchCondition* _tmp1_; - SearchConditionText* _tmp2_; + SearchConditionText* _tmp0_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; - gint _tmp5_; - gint _tmp6_; - sqlite3_stmt* _tmp7_; - SavedSearchID _tmp8_; - gint64 _tmp9_; - gint _tmp10_; - gint _tmp11_; - sqlite3_stmt* _tmp12_; - SearchConditionText* _tmp13_; - SearchConditionSearchType _tmp14_; - SearchConditionSearchType _tmp15_; - gchar* _tmp16_; - GDestroyNotify _tmp17_; - gint _tmp18_; - gint _tmp19_; - sqlite3_stmt* _tmp20_; - SearchConditionText* _tmp21_; - SearchConditionTextContext _tmp22_; - SearchConditionTextContext _tmp23_; - gchar* _tmp24_; - GDestroyNotify _tmp25_; - gint _tmp26_; - gint _tmp27_; - sqlite3_stmt* _tmp28_; - SearchConditionText* _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; - gchar* _tmp32_; - GDestroyNotify _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3_stmt* _tmp36_; - gint _tmp37_; - gint _tmp38_; -#line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp1_ = condition; + sqlite3* _tmp1_; + sqlite3_stmt* _tmp2_ = NULL; + gint _tmp3_; + gint _tmp4_; + sqlite3_stmt* _tmp5_; + SavedSearchID _tmp6_; + gint64 _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + SearchConditionText* _tmp10_; + SearchConditionSearchType _tmp11_; + SearchConditionSearchType _tmp12_; + gchar* _tmp13_; + GDestroyNotify _tmp14_; + gint _tmp15_; + sqlite3_stmt* _tmp16_; + SearchConditionText* _tmp17_; + SearchConditionTextContext _tmp18_; + SearchConditionTextContext _tmp19_; + gchar* _tmp20_; + GDestroyNotify _tmp21_; + gint _tmp22_; + sqlite3_stmt* _tmp23_; + SearchConditionText* _tmp24_; + const gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + GDestroyNotify _tmp28_; + gint _tmp29_; + sqlite3_stmt* _tmp30_; + gint _tmp31_; #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp1_) : NULL); + _tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) condition) : NULL); #line 238 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - text = _tmp2_; + text = _tmp0_; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp3_ = database_table_db; + _tmp1_ = database_table_db; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp3_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp4_, NULL); + _tmp3_ = sqlite3_prepare_v2 (_tmp1_, "INSERT INTO SavedSearchDBTable_Text (search_id, search_type, context, " "text) VALUES (?, ?, ?, ?)", -1, &_tmp2_, NULL); #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp4_; + stmt = _tmp2_; #line 240 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp5_; + res = _tmp3_; #line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = res; + _tmp4_ = res; #line 243 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); -#line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = stmt; + _vala_assert (_tmp4_ == SQLITE_OK, "res == Sqlite.OK"); #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = *id; + _tmp5_ = stmt; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = _tmp8_.id; + _tmp6_ = *id; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_); + _tmp7_ = _tmp6_.id; #line 245 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); #line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp8_ = res; #line 246 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = stmt; + _tmp9_ = stmt; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = text; + _tmp10_ = text; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp11_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = search_condition_search_type_to_string (_tmp15_); + _tmp13_ = search_condition_search_type_to_string (_tmp12_); #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = g_free; + _tmp14_ = g_free; #line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = sqlite3_bind_text (_tmp12_, 2, _tmp16_, -1, _tmp17_); -#line 248 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp18_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp13_, -1, _tmp14_); #line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 249 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp15_ == SQLITE_OK, "res == Sqlite.OK"); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _tmp16_ = stmt; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = text; + _tmp17_ = text; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = search_condition_text_get_context (_tmp21_); + _tmp18_ = search_condition_text_get_context (_tmp17_); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = _tmp22_; + _tmp19_ = _tmp18_; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_condition_text_context_to_string (_tmp23_); + _tmp20_ = search_condition_text_context_to_string (_tmp19_); #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = g_free; + _tmp21_ = g_free; #line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = sqlite3_bind_text (_tmp20_, 3, _tmp24_, -1, _tmp25_); -#line 251 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp26_; + res = sqlite3_bind_text (_tmp16_, 3, _tmp20_, -1, _tmp21_); #line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = res; + _tmp22_ = res; #line 252 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK"); -#line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = stmt; + _vala_assert (_tmp22_ == SQLITE_OK, "res == Sqlite.OK"); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = text; + _tmp23_ = stmt; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = search_condition_text_get_text (_tmp29_); + _tmp24_ = text; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _tmp30_; + _tmp25_ = search_condition_text_get_text (_tmp24_); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = g_strdup (_tmp31_); + _tmp26_ = _tmp25_; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = g_free; + _tmp27_ = g_strdup (_tmp26_); #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_bind_text (_tmp28_, 4, _tmp32_, -1, _tmp33_); + _tmp28_ = g_free; #line 254 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = sqlite3_bind_text (_tmp23_, 4, _tmp27_, -1, _tmp28_); #line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp29_ = res; #line 255 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK"); #line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = stmt; + _tmp30_ = stmt; #line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sqlite3_step (_tmp36_); -#line 257 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp37_; + res = sqlite3_step (_tmp30_); #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = res; + _tmp31_ = res; #line 258 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp38_ != SQLITE_DONE) { -#line 1790 "SavedSearchDBTable.c" - gint _tmp39_; + if (_tmp31_ != SQLITE_DONE) { +#line 1861 "SavedSearchDBTable.c" + gint _tmp32_; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp32_ = res; #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp39_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Text.add", _tmp32_, &_inner_error_); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1804,7 +1875,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (text); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1808 "SavedSearchDBTable.c" +#line 1879 "SavedSearchDBTable.c" } else { #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -1816,7 +1887,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 259 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1820 "SavedSearchDBTable.c" +#line 1891 "SavedSearchDBTable.c" } } } @@ -1824,166 +1895,145 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 237 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (text); -#line 1828 "SavedSearchDBTable.c" +#line 1899 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp40_; #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = condition; -#line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { -#line 1835 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE)) { +#line 1903 "SavedSearchDBTable.c" SearchConditionMediaType* media_type = NULL; - SearchCondition* _tmp41_; - SearchConditionMediaType* _tmp42_; + SearchConditionMediaType* _tmp33_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp43_; - sqlite3_stmt* _tmp44_ = NULL; - gint _tmp45_; - gint _tmp46_; - sqlite3_stmt* _tmp47_; - SavedSearchID _tmp48_; - gint64 _tmp49_; - gint _tmp50_; - gint _tmp51_; - sqlite3_stmt* _tmp52_; - SearchConditionMediaType* _tmp53_; - SearchConditionSearchType _tmp54_; - SearchConditionSearchType _tmp55_; - gchar* _tmp56_; - GDestroyNotify _tmp57_; - gint _tmp58_; - gint _tmp59_; - sqlite3_stmt* _tmp60_; - SearchConditionMediaType* _tmp61_; - SearchConditionMediaTypeContext _tmp62_; - SearchConditionMediaTypeContext _tmp63_; - gchar* _tmp64_; - GDestroyNotify _tmp65_; - gint _tmp66_; - gint _tmp67_; - sqlite3_stmt* _tmp68_; - SearchConditionMediaType* _tmp69_; - SearchConditionMediaTypeMediaType _tmp70_; - SearchConditionMediaTypeMediaType _tmp71_; - gchar* _tmp72_; - GDestroyNotify _tmp73_; - gint _tmp74_; - gint _tmp75_; - sqlite3_stmt* _tmp76_; - gint _tmp77_; - gint _tmp78_; -#line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = condition; + sqlite3* _tmp34_; + sqlite3_stmt* _tmp35_ = NULL; + gint _tmp36_; + gint _tmp37_; + sqlite3_stmt* _tmp38_; + SavedSearchID _tmp39_; + gint64 _tmp40_; + gint _tmp41_; + sqlite3_stmt* _tmp42_; + SearchConditionMediaType* _tmp43_; + SearchConditionSearchType _tmp44_; + SearchConditionSearchType _tmp45_; + gchar* _tmp46_; + GDestroyNotify _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + SearchConditionMediaType* _tmp50_; + SearchConditionMediaTypeContext _tmp51_; + SearchConditionMediaTypeContext _tmp52_; + gchar* _tmp53_; + GDestroyNotify _tmp54_; + gint _tmp55_; + sqlite3_stmt* _tmp56_; + SearchConditionMediaType* _tmp57_; + SearchConditionMediaTypeMediaType _tmp58_; + SearchConditionMediaTypeMediaType _tmp59_; + gchar* _tmp60_; + GDestroyNotify _tmp61_; + gint _tmp62_; + sqlite3_stmt* _tmp63_; + gint _tmp64_; #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp41_) : NULL); + _tmp33_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) condition) : NULL); #line 261 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - media_type = _tmp42_; + media_type = _tmp33_; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = database_table_db; + _tmp34_ = database_table_db; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = sqlite3_prepare_v2 (_tmp43_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \ -"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp44_, NULL); + _tmp36_ = sqlite3_prepare_v2 (_tmp34_, "INSERT INTO SavedSearchDBTable_MediaType (search_id, search_type, cont" \ +"ext, " "type) VALUES (?, ?, ?, ?)", -1, &_tmp35_, NULL); #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp44_; + stmt = _tmp35_; #line 263 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp45_; + res = _tmp36_; #line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = res; + _tmp37_ = res; #line 266 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp46_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK"); #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = stmt; + _tmp38_ = stmt; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = *id; + _tmp39_ = *id; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp49_ = _tmp48_.id; + _tmp40_ = _tmp39_.id; #line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = sqlite3_bind_int64 (_tmp47_, 1, _tmp49_); -#line 268 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp50_; + res = sqlite3_bind_int64 (_tmp38_, 1, _tmp40_); #line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = res; + _tmp41_ = res; #line 269 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp51_ == SQLITE_OK, "res == Sqlite.OK"); -#line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = stmt; + _vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK"); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = media_type; + _tmp42_ = stmt; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp43_ = media_type; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp55_ = _tmp54_; + _tmp44_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = search_condition_search_type_to_string (_tmp55_); + _tmp45_ = _tmp44_; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp57_ = g_free; + _tmp46_ = search_condition_search_type_to_string (_tmp45_); #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = sqlite3_bind_text (_tmp52_, 2, _tmp56_, -1, _tmp57_); + _tmp47_ = g_free; #line 271 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp58_; + res = sqlite3_bind_text (_tmp42_, 2, _tmp46_, -1, _tmp47_); #line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = res; + _tmp48_ = res; #line 272 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = stmt; -#line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = media_type; + _tmp49_ = stmt; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = search_condition_media_type_get_context (_tmp61_); + _tmp50_ = media_type; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = _tmp62_; + _tmp51_ = search_condition_media_type_get_context (_tmp50_); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = search_condition_media_type_context_to_string (_tmp63_); + _tmp52_ = _tmp51_; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp65_ = g_free; + _tmp53_ = search_condition_media_type_context_to_string (_tmp52_); #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = sqlite3_bind_text (_tmp60_, 3, _tmp64_, -1, _tmp65_); + _tmp54_ = g_free; #line 274 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp66_; + res = sqlite3_bind_text (_tmp49_, 3, _tmp53_, -1, _tmp54_); #line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp55_ = res; #line 275 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp67_ == SQLITE_OK, "res == Sqlite.OK"); -#line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = stmt; + _vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK"); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = media_type; + _tmp56_ = stmt; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = search_condition_media_type_get_media_type (_tmp69_); + _tmp57_ = media_type; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = _tmp70_; + _tmp58_ = search_condition_media_type_get_media_type (_tmp57_); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = search_condition_media_type_media_type_to_string (_tmp71_); + _tmp59_ = _tmp58_; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp73_ = g_free; + _tmp60_ = search_condition_media_type_media_type_to_string (_tmp59_); #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = sqlite3_bind_text (_tmp68_, 4, _tmp72_, -1, _tmp73_); + _tmp61_ = g_free; #line 277 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp74_; + res = sqlite3_bind_text (_tmp56_, 4, _tmp60_, -1, _tmp61_); #line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = res; + _tmp62_ = res; #line 278 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK"); -#line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = stmt; + _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); #line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = sqlite3_step (_tmp76_); + _tmp63_ = stmt; #line 280 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp77_; + res = sqlite3_step (_tmp63_); #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = res; + _tmp64_ = res; #line 281 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp78_ != SQLITE_DONE) { -#line 1981 "SavedSearchDBTable.c" - gint _tmp79_; + if (_tmp64_ != SQLITE_DONE) { +#line 2031 "SavedSearchDBTable.c" + gint _tmp65_; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp79_ = res; + _tmp65_ = res; #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp79_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_MediaType.add", _tmp65_, &_inner_error_); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -1996,7 +2046,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (media_type); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 1999 "SavedSearchDBTable.c" +#line 2049 "SavedSearchDBTable.c" } else { #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2008,7 +2058,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2011 "SavedSearchDBTable.c" +#line 2061 "SavedSearchDBTable.c" } } } @@ -2016,137 +2066,119 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 260 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (media_type); -#line 2019 "SavedSearchDBTable.c" +#line 2069 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp80_; -#line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = condition; #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_SEARCH_CONDITION_FLAGGED)) { -#line 2026 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED)) { +#line 2073 "SavedSearchDBTable.c" SearchConditionFlagged* flag_state = NULL; - SearchCondition* _tmp81_; - SearchConditionFlagged* _tmp82_; + SearchConditionFlagged* _tmp66_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp83_; - sqlite3_stmt* _tmp84_ = NULL; - gint _tmp85_; - gint _tmp86_; - sqlite3_stmt* _tmp87_; - SavedSearchID _tmp88_; - gint64 _tmp89_; + sqlite3* _tmp67_; + sqlite3_stmt* _tmp68_ = NULL; + gint _tmp69_; + gint _tmp70_; + sqlite3_stmt* _tmp71_; + SavedSearchID _tmp72_; + gint64 _tmp73_; + gint _tmp74_; + sqlite3_stmt* _tmp75_; + SearchConditionFlagged* _tmp76_; + SearchConditionSearchType _tmp77_; + SearchConditionSearchType _tmp78_; + gchar* _tmp79_; + GDestroyNotify _tmp80_; + gint _tmp81_; + sqlite3_stmt* _tmp82_; + SearchConditionFlagged* _tmp83_; + SearchConditionFlaggedState _tmp84_; + SearchConditionFlaggedState _tmp85_; + gchar* _tmp86_; + GDestroyNotify _tmp87_; + gint _tmp88_; + sqlite3_stmt* _tmp89_; gint _tmp90_; - gint _tmp91_; - sqlite3_stmt* _tmp92_; - SearchConditionFlagged* _tmp93_; - SearchConditionSearchType _tmp94_; - SearchConditionSearchType _tmp95_; - gchar* _tmp96_; - GDestroyNotify _tmp97_; - gint _tmp98_; - gint _tmp99_; - sqlite3_stmt* _tmp100_; - SearchConditionFlagged* _tmp101_; - SearchConditionFlaggedState _tmp102_; - SearchConditionFlaggedState _tmp103_; - gchar* _tmp104_; - GDestroyNotify _tmp105_; - gint _tmp106_; - gint _tmp107_; - sqlite3_stmt* _tmp108_; - gint _tmp109_; - gint _tmp110_; -#line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp81_ = condition; #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp81_) : NULL); + _tmp66_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) condition) : NULL); #line 284 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - flag_state = _tmp82_; + flag_state = _tmp66_; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = database_table_db; + _tmp67_ = database_table_db; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_prepare_v2 (_tmp83_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp84_, NULL); + _tmp69_ = sqlite3_prepare_v2 (_tmp67_, "INSERT INTO SavedSearchDBTable_Flagged (search_id, search_type, " "flag_state) VALUES (?, ?, ?)", -1, &_tmp68_, NULL); #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp84_; + stmt = _tmp68_; #line 286 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = _tmp69_; #line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp70_ = res; #line 289 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = stmt; + _vala_assert (_tmp70_ == SQLITE_OK, "res == Sqlite.OK"); #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = *id; + _tmp71_ = stmt; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp89_ = _tmp88_.id; + _tmp72_ = *id; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = sqlite3_bind_int64 (_tmp87_, 1, _tmp89_); + _tmp73_ = _tmp72_.id; #line 291 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp90_; + res = sqlite3_bind_int64 (_tmp71_, 1, _tmp73_); #line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp74_ = res; #line 292 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp91_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp74_ == SQLITE_OK, "res == Sqlite.OK"); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = stmt; + _tmp75_ = stmt; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = flag_state; + _tmp76_ = flag_state; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp77_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = _tmp94_; + _tmp78_ = _tmp77_; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = search_condition_search_type_to_string (_tmp95_); + _tmp79_ = search_condition_search_type_to_string (_tmp78_); #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp97_ = g_free; + _tmp80_ = g_free; #line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = sqlite3_bind_text (_tmp92_, 2, _tmp96_, -1, _tmp97_); -#line 294 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp98_; + res = sqlite3_bind_text (_tmp75_, 2, _tmp79_, -1, _tmp80_); #line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = res; + _tmp81_ = res; #line 295 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp99_ == SQLITE_OK, "res == Sqlite.OK"); -#line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = stmt; + _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = flag_state; + _tmp82_ = stmt; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = search_condition_flagged_get_state (_tmp101_); + _tmp83_ = flag_state; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = _tmp102_; + _tmp84_ = search_condition_flagged_get_state (_tmp83_); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp104_ = search_condition_flagged_state_to_string (_tmp103_); + _tmp85_ = _tmp84_; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp105_ = g_free; + _tmp86_ = search_condition_flagged_state_to_string (_tmp85_); #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp106_ = sqlite3_bind_text (_tmp100_, 3, _tmp104_, -1, _tmp105_); + _tmp87_ = g_free; #line 297 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp106_; + res = sqlite3_bind_text (_tmp82_, 3, _tmp86_, -1, _tmp87_); #line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp107_ = res; + _tmp88_ = res; #line 298 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK"); -#line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp108_ = stmt; + _vala_assert (_tmp88_ == SQLITE_OK, "res == Sqlite.OK"); #line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp109_ = sqlite3_step (_tmp108_); + _tmp89_ = stmt; #line 300 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp109_; + res = sqlite3_step (_tmp89_); #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp110_ = res; + _tmp90_ = res; #line 301 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp110_ != SQLITE_DONE) { -#line 2144 "SavedSearchDBTable.c" - gint _tmp111_; + if (_tmp90_ != SQLITE_DONE) { +#line 2176 "SavedSearchDBTable.c" + gint _tmp91_; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp111_ = res; + _tmp91_ = res; #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp111_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Flagged.add", _tmp91_, &_inner_error_); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2159,7 +2191,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (flag_state); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2162 "SavedSearchDBTable.c" +#line 2194 "SavedSearchDBTable.c" } else { #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2171,7 +2203,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 302 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2174 "SavedSearchDBTable.c" +#line 2206 "SavedSearchDBTable.c" } } } @@ -2179,166 +2211,145 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 283 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (flag_state); -#line 2182 "SavedSearchDBTable.c" +#line 2214 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp112_; #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp112_ = condition; -#line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, TYPE_SEARCH_CONDITION_MODIFIED)) { -#line 2189 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED)) { +#line 2218 "SavedSearchDBTable.c" SearchConditionModified* modified_state = NULL; - SearchCondition* _tmp113_; - SearchConditionModified* _tmp114_; + SearchConditionModified* _tmp92_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp115_; - sqlite3_stmt* _tmp116_ = NULL; - gint _tmp117_; - gint _tmp118_; - sqlite3_stmt* _tmp119_; - SavedSearchID _tmp120_; - gint64 _tmp121_; - gint _tmp122_; + sqlite3* _tmp93_; + sqlite3_stmt* _tmp94_ = NULL; + gint _tmp95_; + gint _tmp96_; + sqlite3_stmt* _tmp97_; + SavedSearchID _tmp98_; + gint64 _tmp99_; + gint _tmp100_; + sqlite3_stmt* _tmp101_; + SearchConditionModified* _tmp102_; + SearchConditionSearchType _tmp103_; + SearchConditionSearchType _tmp104_; + gchar* _tmp105_; + GDestroyNotify _tmp106_; + gint _tmp107_; + sqlite3_stmt* _tmp108_; + SearchConditionModified* _tmp109_; + SearchConditionModifiedContext _tmp110_; + SearchConditionModifiedContext _tmp111_; + gchar* _tmp112_; + GDestroyNotify _tmp113_; + gint _tmp114_; + sqlite3_stmt* _tmp115_; + SearchConditionModified* _tmp116_; + SearchConditionModifiedState _tmp117_; + SearchConditionModifiedState _tmp118_; + gchar* _tmp119_; + GDestroyNotify _tmp120_; + gint _tmp121_; + sqlite3_stmt* _tmp122_; gint _tmp123_; - sqlite3_stmt* _tmp124_; - SearchConditionModified* _tmp125_; - SearchConditionSearchType _tmp126_; - SearchConditionSearchType _tmp127_; - gchar* _tmp128_; - GDestroyNotify _tmp129_; - gint _tmp130_; - gint _tmp131_; - sqlite3_stmt* _tmp132_; - SearchConditionModified* _tmp133_; - SearchConditionModifiedContext _tmp134_; - SearchConditionModifiedContext _tmp135_; - gchar* _tmp136_; - GDestroyNotify _tmp137_; - gint _tmp138_; - gint _tmp139_; - sqlite3_stmt* _tmp140_; - SearchConditionModified* _tmp141_; - SearchConditionModifiedState _tmp142_; - SearchConditionModifiedState _tmp143_; - gchar* _tmp144_; - GDestroyNotify _tmp145_; - gint _tmp146_; - gint _tmp147_; - sqlite3_stmt* _tmp148_; - gint _tmp149_; - gint _tmp150_; -#line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp113_ = condition; #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp113_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp113_) : NULL); + _tmp92_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) condition) : NULL); #line 304 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - modified_state = _tmp114_; + modified_state = _tmp92_; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp115_ = database_table_db; + _tmp93_ = database_table_db; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp117_ = sqlite3_prepare_v2 (_tmp115_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \ -"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp116_, NULL); + _tmp95_ = sqlite3_prepare_v2 (_tmp93_, "INSERT INTO SavedSearchDBTable_Modified (search_id, search_type, conte" \ +"xt, " "modified_state) VALUES (?, ?, ?, ?)", -1, &_tmp94_, NULL); #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp116_; + stmt = _tmp94_; #line 306 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp117_; + res = _tmp95_; #line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp118_ = res; + _tmp96_ = res; #line 309 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp118_ == SQLITE_OK, "res == Sqlite.OK"); -#line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp119_ = stmt; + _vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK"); #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp120_ = *id; + _tmp97_ = stmt; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp121_ = _tmp120_.id; + _tmp98_ = *id; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp122_ = sqlite3_bind_int64 (_tmp119_, 1, _tmp121_); + _tmp99_ = _tmp98_.id; #line 311 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp122_; + res = sqlite3_bind_int64 (_tmp97_, 1, _tmp99_); #line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp123_ = res; + _tmp100_ = res; #line 312 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp123_ == SQLITE_OK, "res == Sqlite.OK"); -#line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp124_ = stmt; + _vala_assert (_tmp100_ == SQLITE_OK, "res == Sqlite.OK"); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp125_ = modified_state; + _tmp101_ = stmt; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp126_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp102_ = modified_state; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp127_ = _tmp126_; + _tmp103_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp128_ = search_condition_search_type_to_string (_tmp127_); + _tmp104_ = _tmp103_; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp129_ = g_free; + _tmp105_ = search_condition_search_type_to_string (_tmp104_); #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp130_ = sqlite3_bind_text (_tmp124_, 2, _tmp128_, -1, _tmp129_); + _tmp106_ = g_free; #line 314 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp130_; + res = sqlite3_bind_text (_tmp101_, 2, _tmp105_, -1, _tmp106_); #line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp131_ = res; + _tmp107_ = res; #line 315 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp131_ == SQLITE_OK, "res == Sqlite.OK"); -#line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp132_ = stmt; + _vala_assert (_tmp107_ == SQLITE_OK, "res == Sqlite.OK"); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp133_ = modified_state; + _tmp108_ = stmt; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp134_ = search_condition_modified_get_context (_tmp133_); + _tmp109_ = modified_state; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp135_ = _tmp134_; + _tmp110_ = search_condition_modified_get_context (_tmp109_); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp136_ = search_condition_modified_context_to_string (_tmp135_); + _tmp111_ = _tmp110_; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp137_ = g_free; + _tmp112_ = search_condition_modified_context_to_string (_tmp111_); #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp138_ = sqlite3_bind_text (_tmp132_, 3, _tmp136_, -1, _tmp137_); + _tmp113_ = g_free; #line 317 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp138_; + res = sqlite3_bind_text (_tmp108_, 3, _tmp112_, -1, _tmp113_); #line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp139_ = res; + _tmp114_ = res; #line 318 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp114_ == SQLITE_OK, "res == Sqlite.OK"); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp140_ = stmt; + _tmp115_ = stmt; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = modified_state; + _tmp116_ = modified_state; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp142_ = search_condition_modified_get_state (_tmp141_); + _tmp117_ = search_condition_modified_get_state (_tmp116_); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp143_ = _tmp142_; + _tmp118_ = _tmp117_; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp144_ = search_condition_modified_state_to_string (_tmp143_); + _tmp119_ = search_condition_modified_state_to_string (_tmp118_); #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp145_ = g_free; + _tmp120_ = g_free; #line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp146_ = sqlite3_bind_text (_tmp140_, 4, _tmp144_, -1, _tmp145_); -#line 320 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp146_; + res = sqlite3_bind_text (_tmp115_, 4, _tmp119_, -1, _tmp120_); #line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp147_ = res; + _tmp121_ = res; #line 321 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp147_ == SQLITE_OK, "res == Sqlite.OK"); -#line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp148_ = stmt; + _vala_assert (_tmp121_ == SQLITE_OK, "res == Sqlite.OK"); #line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp149_ = sqlite3_step (_tmp148_); + _tmp122_ = stmt; #line 323 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp149_; + res = sqlite3_step (_tmp122_); #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp150_ = res; + _tmp123_ = res; #line 324 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp150_ != SQLITE_DONE) { -#line 2335 "SavedSearchDBTable.c" - gint _tmp151_; + if (_tmp123_ != SQLITE_DONE) { +#line 2346 "SavedSearchDBTable.c" + gint _tmp124_; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp151_ = res; + _tmp124_ = res; #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp151_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Modified.add", _tmp124_, &_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2351,7 +2362,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (modified_state); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2353 "SavedSearchDBTable.c" +#line 2364 "SavedSearchDBTable.c" } else { #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2363,7 +2374,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 325 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2365 "SavedSearchDBTable.c" +#line 2376 "SavedSearchDBTable.c" } } } @@ -2371,163 +2382,139 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 303 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (modified_state); -#line 2373 "SavedSearchDBTable.c" +#line 2384 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp152_; #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp152_ = condition; -#line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp152_, TYPE_SEARCH_CONDITION_RATING)) { -#line 2380 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING)) { +#line 2388 "SavedSearchDBTable.c" SearchConditionRating* rating = NULL; - SearchCondition* _tmp153_; - SearchConditionRating* _tmp154_; + SearchConditionRating* _tmp125_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp155_; - sqlite3_stmt* _tmp156_ = NULL; - gint _tmp157_; - gint _tmp158_; - sqlite3_stmt* _tmp159_; - SavedSearchID _tmp160_; - gint64 _tmp161_; - gint _tmp162_; - gint _tmp163_; - sqlite3_stmt* _tmp164_; - SearchConditionRating* _tmp165_; - SearchConditionSearchType _tmp166_; - SearchConditionSearchType _tmp167_; - gchar* _tmp168_; - GDestroyNotify _tmp169_; - gint _tmp170_; - gint _tmp171_; - sqlite3_stmt* _tmp172_; - SearchConditionRating* _tmp173_; - Rating _tmp174_; - Rating _tmp175_; - gint _tmp176_; - gint _tmp177_; - gint _tmp178_; - sqlite3_stmt* _tmp179_; - SearchConditionRating* _tmp180_; - SearchConditionRatingContext _tmp181_; - SearchConditionRatingContext _tmp182_; - gchar* _tmp183_; - GDestroyNotify _tmp184_; - gint _tmp185_; - gint _tmp186_; - sqlite3_stmt* _tmp187_; - gint _tmp188_; - gint _tmp189_; -#line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp153_ = condition; + sqlite3* _tmp126_; + sqlite3_stmt* _tmp127_ = NULL; + gint _tmp128_; + gint _tmp129_; + sqlite3_stmt* _tmp130_; + SavedSearchID _tmp131_; + gint64 _tmp132_; + gint _tmp133_; + sqlite3_stmt* _tmp134_; + SearchConditionRating* _tmp135_; + SearchConditionSearchType _tmp136_; + SearchConditionSearchType _tmp137_; + gchar* _tmp138_; + GDestroyNotify _tmp139_; + gint _tmp140_; + sqlite3_stmt* _tmp141_; + SearchConditionRating* _tmp142_; + Rating _tmp143_; + Rating _tmp144_; + gint _tmp145_; + sqlite3_stmt* _tmp146_; + SearchConditionRating* _tmp147_; + SearchConditionRatingContext _tmp148_; + SearchConditionRatingContext _tmp149_; + gchar* _tmp150_; + GDestroyNotify _tmp151_; + gint _tmp152_; + sqlite3_stmt* _tmp153_; + gint _tmp154_; #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp154_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp153_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp153_) : NULL); + _tmp125_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) condition) : NULL); #line 327 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - rating = _tmp154_; + rating = _tmp125_; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp155_ = database_table_db; + _tmp126_ = database_table_db; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp157_ = sqlite3_prepare_v2 (_tmp155_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \ -" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp156_, NULL); + _tmp128_ = sqlite3_prepare_v2 (_tmp126_, "INSERT INTO SavedSearchDBTable_Rating (search_id, search_type, rating," \ +" " "context) VALUES (?, ?, ?, ?)", -1, &_tmp127_, NULL); #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp156_; + stmt = _tmp127_; #line 329 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp157_; + res = _tmp128_; #line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp158_ = res; + _tmp129_ = res; #line 332 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp158_ == SQLITE_OK, "res == Sqlite.OK"); -#line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp159_ = stmt; + _vala_assert (_tmp129_ == SQLITE_OK, "res == Sqlite.OK"); #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp160_ = *id; + _tmp130_ = stmt; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp161_ = _tmp160_.id; + _tmp131_ = *id; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp162_ = sqlite3_bind_int64 (_tmp159_, 1, _tmp161_); + _tmp132_ = _tmp131_.id; #line 334 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp162_; + res = sqlite3_bind_int64 (_tmp130_, 1, _tmp132_); #line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp163_ = res; + _tmp133_ = res; #line 335 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp163_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp133_ == SQLITE_OK, "res == Sqlite.OK"); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp164_ = stmt; + _tmp134_ = stmt; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp165_ = rating; + _tmp135_ = rating; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp166_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp136_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp167_ = _tmp166_; + _tmp137_ = _tmp136_; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp168_ = search_condition_search_type_to_string (_tmp167_); + _tmp138_ = search_condition_search_type_to_string (_tmp137_); #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp169_ = g_free; + _tmp139_ = g_free; #line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp170_ = sqlite3_bind_text (_tmp164_, 2, _tmp168_, -1, _tmp169_); -#line 337 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp170_; + res = sqlite3_bind_text (_tmp134_, 2, _tmp138_, -1, _tmp139_); #line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp171_ = res; + _tmp140_ = res; #line 338 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK"); -#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp172_ = stmt; -#line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp173_ = rating; + _vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK"); #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp174_ = search_condition_rating_get_rating (_tmp173_); + _tmp141_ = stmt; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp175_ = _tmp174_; + _tmp142_ = rating; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp176_ = rating_serialize (_tmp175_); + _tmp143_ = search_condition_rating_get_rating (_tmp142_); #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp177_ = sqlite3_bind_int (_tmp172_, 3, _tmp176_); + _tmp144_ = _tmp143_; #line 340 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp177_; + res = sqlite3_bind_int (_tmp141_, 3, rating_serialize (_tmp144_)); #line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp178_ = res; + _tmp145_ = res; #line 341 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp145_ == SQLITE_OK, "res == Sqlite.OK"); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp179_ = stmt; + _tmp146_ = stmt; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp180_ = rating; + _tmp147_ = rating; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp181_ = search_condition_rating_get_context (_tmp180_); + _tmp148_ = search_condition_rating_get_context (_tmp147_); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp182_ = _tmp181_; + _tmp149_ = _tmp148_; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp183_ = search_condition_rating_context_to_string (_tmp182_); + _tmp150_ = search_condition_rating_context_to_string (_tmp149_); #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp184_ = g_free; + _tmp151_ = g_free; #line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp185_ = sqlite3_bind_text (_tmp179_, 4, _tmp183_, -1, _tmp184_); -#line 343 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp185_; + res = sqlite3_bind_text (_tmp146_, 4, _tmp150_, -1, _tmp151_); #line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp186_ = res; + _tmp152_ = res; #line 344 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp186_ == SQLITE_OK, "res == Sqlite.OK"); -#line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp187_ = stmt; + _vala_assert (_tmp152_ == SQLITE_OK, "res == Sqlite.OK"); #line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp188_ = sqlite3_step (_tmp187_); + _tmp153_ = stmt; #line 346 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp188_; + res = sqlite3_step (_tmp153_); #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp189_ = res; + _tmp154_ = res; #line 347 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp189_ != SQLITE_DONE) { -#line 2523 "SavedSearchDBTable.c" - gint _tmp190_; + if (_tmp154_ != SQLITE_DONE) { +#line 2510 "SavedSearchDBTable.c" + gint _tmp155_; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp190_ = res; + _tmp155_ = res; #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp190_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Rating.add", _tmp155_, &_inner_error_); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2540,7 +2527,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (rating); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2541 "SavedSearchDBTable.c" +#line 2528 "SavedSearchDBTable.c" } else { #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2552,7 +2539,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 348 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2553 "SavedSearchDBTable.c" +#line 2540 "SavedSearchDBTable.c" } } } @@ -2560,187 +2547,157 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 326 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (rating); -#line 2561 "SavedSearchDBTable.c" +#line 2548 "SavedSearchDBTable.c" } else { - SearchCondition* _tmp191_; #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp191_ = condition; -#line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp191_, TYPE_SEARCH_CONDITION_DATE)) { -#line 2568 "SavedSearchDBTable.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE)) { +#line 2552 "SavedSearchDBTable.c" SearchConditionDate* date = NULL; - SearchCondition* _tmp192_; - SearchConditionDate* _tmp193_; + SearchConditionDate* _tmp156_; sqlite3_stmt* stmt = NULL; gint res = 0; - sqlite3* _tmp194_; - sqlite3_stmt* _tmp195_ = NULL; - gint _tmp196_; - gint _tmp197_; - sqlite3_stmt* _tmp198_; - SavedSearchID _tmp199_; - gint64 _tmp200_; - gint _tmp201_; - gint _tmp202_; - sqlite3_stmt* _tmp203_; - SearchConditionDate* _tmp204_; - SearchConditionSearchType _tmp205_; - SearchConditionSearchType _tmp206_; - gchar* _tmp207_; - GDestroyNotify _tmp208_; - gint _tmp209_; - gint _tmp210_; - sqlite3_stmt* _tmp211_; - SearchConditionDate* _tmp212_; - SearchConditionDateContext _tmp213_; - SearchConditionDateContext _tmp214_; - gchar* _tmp215_; - GDestroyNotify _tmp216_; - gint _tmp217_; - gint _tmp218_; - sqlite3_stmt* _tmp219_; - SearchConditionDate* _tmp220_; - GDateTime* _tmp221_; - GDateTime* _tmp222_; - gint64 _tmp223_; - gint _tmp224_; - gint _tmp225_; - sqlite3_stmt* _tmp226_; - SearchConditionDate* _tmp227_; - GDateTime* _tmp228_; - GDateTime* _tmp229_; - gint64 _tmp230_; - gint _tmp231_; - gint _tmp232_; - sqlite3_stmt* _tmp233_; - gint _tmp234_; - gint _tmp235_; -#line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp192_ = condition; + sqlite3* _tmp157_; + sqlite3_stmt* _tmp158_ = NULL; + gint _tmp159_; + gint _tmp160_; + sqlite3_stmt* _tmp161_; + SavedSearchID _tmp162_; + gint64 _tmp163_; + gint _tmp164_; + sqlite3_stmt* _tmp165_; + SearchConditionDate* _tmp166_; + SearchConditionSearchType _tmp167_; + SearchConditionSearchType _tmp168_; + gchar* _tmp169_; + GDestroyNotify _tmp170_; + gint _tmp171_; + sqlite3_stmt* _tmp172_; + SearchConditionDate* _tmp173_; + SearchConditionDateContext _tmp174_; + SearchConditionDateContext _tmp175_; + gchar* _tmp176_; + GDestroyNotify _tmp177_; + gint _tmp178_; + sqlite3_stmt* _tmp179_; + SearchConditionDate* _tmp180_; + GDateTime* _tmp181_; + GDateTime* _tmp182_; + gint _tmp183_; + sqlite3_stmt* _tmp184_; + SearchConditionDate* _tmp185_; + GDateTime* _tmp186_; + GDateTime* _tmp187_; + gint _tmp188_; + sqlite3_stmt* _tmp189_; + gint _tmp190_; #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp193_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp192_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp192_) : NULL); + _tmp156_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (condition, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) condition) : NULL); #line 350 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - date = _tmp193_; + date = _tmp156_; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp194_ = database_table_db; + _tmp157_ = database_table_db; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp196_ = sqlite3_prepare_v2 (_tmp194_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp195_, NULL); + _tmp159_ = sqlite3_prepare_v2 (_tmp157_, "INSERT INTO SavedSearchDBTable_Date (search_id, search_type, " "context, date_one, date_two) VALUES (?, ?, ?, ?, ?)", -1, &_tmp158_, NULL); #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp195_; + stmt = _tmp158_; #line 352 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp196_; + res = _tmp159_; #line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp197_ = res; + _tmp160_ = res; #line 355 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp197_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp160_ == SQLITE_OK, "res == Sqlite.OK"); #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp198_ = stmt; + _tmp161_ = stmt; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp199_ = *id; + _tmp162_ = *id; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp200_ = _tmp199_.id; + _tmp163_ = _tmp162_.id; #line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp201_ = sqlite3_bind_int64 (_tmp198_, 1, _tmp200_); -#line 357 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp201_; + res = sqlite3_bind_int64 (_tmp161_, 1, _tmp163_); #line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp202_ = res; + _tmp164_ = res; #line 358 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp202_ == SQLITE_OK, "res == Sqlite.OK"); -#line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp203_ = stmt; + _vala_assert (_tmp164_ == SQLITE_OK, "res == Sqlite.OK"); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp204_ = date; + _tmp165_ = stmt; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp205_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, TYPE_SEARCH_CONDITION, SearchCondition)); + _tmp166_ = date; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp206_ = _tmp205_; + _tmp167_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp207_ = search_condition_search_type_to_string (_tmp206_); + _tmp168_ = _tmp167_; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp208_ = g_free; + _tmp169_ = search_condition_search_type_to_string (_tmp168_); #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp209_ = sqlite3_bind_text (_tmp203_, 2, _tmp207_, -1, _tmp208_); + _tmp170_ = g_free; #line 360 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp209_; + res = sqlite3_bind_text (_tmp165_, 2, _tmp169_, -1, _tmp170_); #line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp210_ = res; + _tmp171_ = res; #line 361 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp210_ == SQLITE_OK, "res == Sqlite.OK"); -#line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp211_ = stmt; + _vala_assert (_tmp171_ == SQLITE_OK, "res == Sqlite.OK"); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp212_ = date; + _tmp172_ = stmt; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp213_ = search_condition_date_get_context (_tmp212_); + _tmp173_ = date; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp214_ = _tmp213_; + _tmp174_ = search_condition_date_get_context (_tmp173_); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp215_ = search_condition_date_context_to_string (_tmp214_); + _tmp175_ = _tmp174_; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp216_ = g_free; + _tmp176_ = search_condition_date_context_to_string (_tmp175_); #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp217_ = sqlite3_bind_text (_tmp211_, 3, _tmp215_, -1, _tmp216_); + _tmp177_ = g_free; #line 363 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp217_; + res = sqlite3_bind_text (_tmp172_, 3, _tmp176_, -1, _tmp177_); #line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp218_ = res; + _tmp178_ = res; #line 364 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp218_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp178_ == SQLITE_OK, "res == Sqlite.OK"); #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp219_ = stmt; + _tmp179_ = stmt; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp220_ = date; + _tmp180_ = date; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp221_ = search_condition_date_get_date_one (_tmp220_); + _tmp181_ = search_condition_date_get_date_one (_tmp180_); #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp222_ = _tmp221_; + _tmp182_ = _tmp181_; #line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp223_ = g_date_time_to_unix (_tmp222_); -#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp224_ = sqlite3_bind_int64 (_tmp219_, 4, _tmp223_); -#line 366 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp224_; + res = sqlite3_bind_int64 (_tmp179_, 4, g_date_time_to_unix (_tmp182_)); #line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp225_ = res; + _tmp183_ = res; #line 367 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp225_ == SQLITE_OK, "res == Sqlite.OK"); -#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp226_ = stmt; + _vala_assert (_tmp183_ == SQLITE_OK, "res == Sqlite.OK"); #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp227_ = date; + _tmp184_ = stmt; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp228_ = search_condition_date_get_date_two (_tmp227_); + _tmp185_ = date; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp229_ = _tmp228_; + _tmp186_ = search_condition_date_get_date_two (_tmp185_); #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp230_ = g_date_time_to_unix (_tmp229_); + _tmp187_ = _tmp186_; #line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp231_ = sqlite3_bind_int64 (_tmp226_, 5, _tmp230_); -#line 369 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp231_; + res = sqlite3_bind_int64 (_tmp184_, 5, g_date_time_to_unix (_tmp187_)); #line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp232_ = res; + _tmp188_ = res; #line 370 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp232_ == SQLITE_OK, "res == Sqlite.OK"); -#line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp233_ = stmt; + _vala_assert (_tmp188_ == SQLITE_OK, "res == Sqlite.OK"); #line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp234_ = sqlite3_step (_tmp233_); + _tmp189_ = stmt; #line 372 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp234_; + res = sqlite3_step (_tmp189_); #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp235_ = res; + _tmp190_ = res; #line 373 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp235_ != SQLITE_DONE) { -#line 2736 "SavedSearchDBTable.c" - gint _tmp236_; + if (_tmp190_ != SQLITE_DONE) { +#line 2693 "SavedSearchDBTable.c" + gint _tmp191_; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp236_ = res; + _tmp191_ = res; #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp236_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Date.add", _tmp191_, &_inner_error_); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2753,7 +2710,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _search_condition_unref0 (date); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2754 "SavedSearchDBTable.c" +#line 2711 "SavedSearchDBTable.c" } else { #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -2765,7 +2722,7 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved g_clear_error (&_inner_error_); #line 374 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2766 "SavedSearchDBTable.c" +#line 2723 "SavedSearchDBTable.c" } } } @@ -2773,11 +2730,11 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved _sqlite3_finalize0 (stmt); #line 349 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (date); -#line 2774 "SavedSearchDBTable.c" +#line 2731 "SavedSearchDBTable.c" } else { #line 376 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_assert_not_reached (); -#line 2778 "SavedSearchDBTable.c" +#line 2735 "SavedSearchDBTable.c" } } } @@ -2787,7 +2744,11 @@ static void saved_search_db_table_add_condition (SavedSearchDBTable* self, Saved } -static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +static void +saved_search_db_table_remove_conditions_for_search_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchID _tmp0_; SavedSearchID _tmp1_; SavedSearchID _tmp2_; @@ -2811,7 +2772,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2812 "SavedSearchDBTable.c" +#line 2773 "SavedSearchDBTable.c" } else { #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2819,7 +2780,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 382 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2820 "SavedSearchDBTable.c" +#line 2781 "SavedSearchDBTable.c" } } #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2834,7 +2795,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2835 "SavedSearchDBTable.c" +#line 2796 "SavedSearchDBTable.c" } else { #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2842,7 +2803,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 383 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2843 "SavedSearchDBTable.c" +#line 2804 "SavedSearchDBTable.c" } } #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2857,7 +2818,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2858 "SavedSearchDBTable.c" +#line 2819 "SavedSearchDBTable.c" } else { #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2865,7 +2826,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 384 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2866 "SavedSearchDBTable.c" +#line 2827 "SavedSearchDBTable.c" } } #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2880,7 +2841,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2881 "SavedSearchDBTable.c" +#line 2842 "SavedSearchDBTable.c" } else { #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2888,7 +2849,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 385 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2889 "SavedSearchDBTable.c" +#line 2850 "SavedSearchDBTable.c" } } #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2903,7 +2864,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2904 "SavedSearchDBTable.c" +#line 2865 "SavedSearchDBTable.c" } else { #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2911,7 +2872,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 386 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2912 "SavedSearchDBTable.c" +#line 2873 "SavedSearchDBTable.c" } } #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -2926,7 +2887,7 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_propagate_error (error, _inner_error_); #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2927 "SavedSearchDBTable.c" +#line 2888 "SavedSearchDBTable.c" } else { #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2934,31 +2895,33 @@ static void saved_search_db_table_remove_conditions_for_search_id (SavedSearchDB g_clear_error (&_inner_error_); #line 387 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 2935 "SavedSearchDBTable.c" +#line 2896 "SavedSearchDBTable.c" } } } -static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, const gchar* table_name, SavedSearchID* search_id, GError** error) { +static void +saved_search_db_table_remove_conditions_for_table (SavedSearchDBTable* self, + const gchar* table_name, + SavedSearchID* search_id, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; - sqlite3_stmt* _tmp4_ = NULL; + sqlite3_stmt* _tmp3_ = NULL; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - gint _tmp7_; - sqlite3_stmt* _tmp8_; - SavedSearchID _tmp9_; - gint64 _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp7_; + SavedSearchID _tmp8_; + gint64 _tmp9_; + gint _tmp10_; + sqlite3_stmt* _tmp11_; gint _tmp12_; - sqlite3_stmt* _tmp13_; - gint _tmp14_; - gint _tmp15_; GError * _inner_error_ = NULL; #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -2969,68 +2932,59 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp0_ = database_table_db; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp1_ = table_name; -#line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", _tmp1_); + _tmp1_ = g_strdup_printf ("DELETE FROM %s WHERE search_id=?", table_name); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL); + _tmp4_ = sqlite3_prepare_v2 (_tmp0_, _tmp2_, -1, &_tmp3_, NULL); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp4_; + stmt = _tmp3_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 393 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp6_; + res = _tmp5_; #line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = res; + _tmp6_ = res; #line 394 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK"); #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = stmt; -#line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = *search_id; + _tmp7_ = stmt; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = _tmp9_.id; + _tmp8_ = *search_id; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp10_); + _tmp9_ = _tmp8_.id; #line 396 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp11_; + res = sqlite3_bind_int64 (_tmp7_, 1, _tmp9_); #line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 397 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK"); -#line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = stmt; + _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); #line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_step (_tmp13_); + _tmp11_ = stmt; #line 399 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp14_; + res = sqlite3_step (_tmp11_); #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp12_ = res; #line 400 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp15_ != SQLITE_DONE) { -#line 3015 "SavedSearchDBTable.c" - const gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - gint _tmp19_; -#line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = table_name; + if (_tmp12_ != SQLITE_DONE) { +#line 2972 "SavedSearchDBTable.c" + gchar* _tmp13_; + gchar* _tmp14_; + gint _tmp15_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = g_strdup_printf ("%s.remove", _tmp16_); + _tmp13_ = g_strdup_printf ("%s.remove", table_name); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = res; + _tmp15_ = res; #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error (_tmp18_, _tmp19_, &_inner_error_); + database_table_throw_error (_tmp14_, _tmp15_, &_inner_error_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3041,7 +2995,7 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl _sqlite3_finalize0 (stmt); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 3042 "SavedSearchDBTable.c" +#line 2996 "SavedSearchDBTable.c" } else { #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3051,17 +3005,21 @@ static void saved_search_db_table_remove_conditions_for_table (SavedSearchDBTabl g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 3052 "SavedSearchDBTable.c" +#line 3006 "SavedSearchDBTable.c" } } } #line 390 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); -#line 3058 "SavedSearchDBTable.c" +#line 3012 "SavedSearchDBTable.c" } -static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +static GeeList* +saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ GeeList* result = NULL; GeeList* list = NULL; GeeArrayList* _tmp0_; @@ -3075,52 +3033,46 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* SavedSearchID _tmp6_; gint64 _tmp7_; gint _tmp8_; - gint _tmp9_; - sqlite3* _tmp27_; - sqlite3_stmt* _tmp28_ = NULL; - gint _tmp29_; + sqlite3* _tmp23_; + sqlite3_stmt* _tmp24_ = NULL; + gint _tmp25_; + gint _tmp26_; + sqlite3_stmt* _tmp27_; + SavedSearchID _tmp28_; + gint64 _tmp29_; gint _tmp30_; - sqlite3_stmt* _tmp31_; - SavedSearchID _tmp32_; - gint64 _tmp33_; - gint _tmp34_; - gint _tmp35_; - sqlite3* _tmp54_; - sqlite3_stmt* _tmp55_ = NULL; - gint _tmp56_; - gint _tmp57_; - sqlite3_stmt* _tmp58_; - SavedSearchID _tmp59_; - gint64 _tmp60_; - gint _tmp61_; - gint _tmp62_; - sqlite3* _tmp78_; - sqlite3_stmt* _tmp79_ = NULL; - gint _tmp80_; - gint _tmp81_; - sqlite3_stmt* _tmp82_; - SavedSearchID _tmp83_; - gint64 _tmp84_; - gint _tmp85_; - gint _tmp86_; - sqlite3* _tmp105_; - sqlite3_stmt* _tmp106_ = NULL; - gint _tmp107_; - gint _tmp108_; - sqlite3_stmt* _tmp109_; - SavedSearchID _tmp110_; - gint64 _tmp111_; - gint _tmp112_; - gint _tmp113_; - sqlite3* _tmp132_; - sqlite3_stmt* _tmp133_ = NULL; - gint _tmp134_; - gint _tmp135_; - sqlite3_stmt* _tmp136_; - SavedSearchID _tmp137_; - gint64 _tmp138_; - gint _tmp139_; - gint _tmp140_; + sqlite3* _tmp45_; + sqlite3_stmt* _tmp46_ = NULL; + gint _tmp47_; + gint _tmp48_; + sqlite3_stmt* _tmp49_; + SavedSearchID _tmp50_; + gint64 _tmp51_; + gint _tmp52_; + sqlite3* _tmp65_; + sqlite3_stmt* _tmp66_ = NULL; + gint _tmp67_; + gint _tmp68_; + sqlite3_stmt* _tmp69_; + SavedSearchID _tmp70_; + gint64 _tmp71_; + gint _tmp72_; + sqlite3* _tmp87_; + sqlite3_stmt* _tmp88_ = NULL; + gint _tmp89_; + gint _tmp90_; + sqlite3_stmt* _tmp91_; + SavedSearchID _tmp92_; + gint64 _tmp93_; + gint _tmp94_; + sqlite3* _tmp108_; + sqlite3_stmt* _tmp109_ = NULL; + gint _tmp110_; + gint _tmp111_; + sqlite3_stmt* _tmp112_; + SavedSearchID _tmp113_; + gint64 _tmp114_; + gint _tmp115_; GError * _inner_error_ = NULL; #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -3151,67 +3103,60 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* #line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp7_ = _tmp6_.id; #line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); -#line 417 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp8_; + res = sqlite3_bind_int64 (_tmp5_, 1, _tmp7_); #line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 418 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3159 "SavedSearchDBTable.c" + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3109 "SavedSearchDBTable.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp9_ = FALSE; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = TRUE; + _tmp9_ = TRUE; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3166 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp11_; - gint _tmp12_; - gint _tmp13_; +#line 3116 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp10_; + gint _tmp11_; SearchConditionText* condition = NULL; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; sqlite3_stmt* _tmp16_; const gchar* _tmp17_; - SearchConditionSearchType _tmp18_; - sqlite3_stmt* _tmp19_; - const gchar* _tmp20_; - sqlite3_stmt* _tmp21_; - const gchar* _tmp22_; - SearchConditionTextContext _tmp23_; - SearchConditionText* _tmp24_; - GeeList* _tmp25_; - SearchConditionText* _tmp26_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + SearchConditionText* _tmp20_; + GeeList* _tmp21_; + SearchConditionText* _tmp22_; #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp10_) { -#line 3184 "SavedSearchDBTable.c" + if (!_tmp9_) { +#line 3131 "SavedSearchDBTable.c" } #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = FALSE; -#line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = stmt; + _tmp9_ = FALSE; #line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = sqlite3_step (_tmp11_); + _tmp10_ = stmt; #line 421 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp12_; + res = sqlite3_step (_tmp10_); #line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 422 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp13_ == SQLITE_DONE) { + if (_tmp11_ == SQLITE_DONE) { #line 423 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3200 "SavedSearchDBTable.c" +#line 3145 "SavedSearchDBTable.c" } else { - gint _tmp14_; + gint _tmp12_; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = res; + _tmp12_ = res; #line 424 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp14_ != SQLITE_ROW) { -#line 3207 "SavedSearchDBTable.c" - gint _tmp15_; + if (_tmp12_ != SQLITE_ROW) { +#line 3152 "SavedSearchDBTable.c" + gint _tmp13_; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = res; + _tmp13_ = res; #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp15_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Text.get_all_rows", _tmp13_, &_inner_error_); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3224,7 +3169,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3225 "SavedSearchDBTable.c" +#line 3170 "SavedSearchDBTable.c" } else { #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3236,125 +3181,113 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3237 "SavedSearchDBTable.c" +#line 3182 "SavedSearchDBTable.c" } } } } #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 0); + _tmp15_ = sqlite3_column_text (_tmp14_, 0); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = search_condition_search_type_from_string (_tmp17_); -#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = stmt; -#line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = sqlite3_column_text (_tmp19_, 2); + _tmp16_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = stmt; + _tmp17_ = sqlite3_column_text (_tmp16_, 2); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = sqlite3_column_text (_tmp21_, 1); + _tmp18_ = stmt; #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = search_condition_text_context_from_string (_tmp22_); + _tmp19_ = sqlite3_column_text (_tmp18_, 1); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_condition_text_new (_tmp18_, _tmp20_, _tmp23_); + _tmp20_ = search_condition_text_new (search_condition_search_type_from_string (_tmp15_), _tmp17_, search_condition_text_context_from_string (_tmp19_)); #line 427 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp24_; + condition = _tmp20_; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = list; + _tmp21_ = list; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = condition; + _tmp22_ = condition; #line 432 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 420 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3270 "SavedSearchDBTable.c" +#line 3211 "SavedSearchDBTable.c" } } #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = database_table_db; + _tmp23_ = database_table_db; #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = sqlite3_prepare_v2 (_tmp27_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp28_, NULL); + _tmp25_ = sqlite3_prepare_v2 (_tmp23_, "SELECT search_type, context, type FROM SavedSearchDBTable_MediaType " "WHERE search_id=?", -1, &_tmp24_, NULL); #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp28_; + stmt = _tmp24_; #line 436 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp29_; + res = _tmp25_; #line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = res; + _tmp26_ = res; #line 439 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); -#line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = stmt; + _vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK"); #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = *search_id; + _tmp27_ = stmt; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _tmp32_.id; + _tmp28_ = *search_id; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = sqlite3_bind_int64 (_tmp31_, 1, _tmp33_); + _tmp29_ = _tmp28_.id; #line 441 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp34_; + res = sqlite3_bind_int64 (_tmp27_, 1, _tmp29_); #line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = res; + _tmp30_ = res; #line 442 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3301 "SavedSearchDBTable.c" + _vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3240 "SavedSearchDBTable.c" { - gboolean _tmp36_ = FALSE; + gboolean _tmp31_ = FALSE; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = TRUE; + _tmp31_ = TRUE; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3308 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp37_; - gint _tmp38_; - gint _tmp39_; +#line 3247 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp32_; + gint _tmp33_; SearchConditionMediaType* condition = NULL; - sqlite3_stmt* _tmp42_; - const gchar* _tmp43_; - SearchConditionSearchType _tmp44_; - sqlite3_stmt* _tmp45_; - const gchar* _tmp46_; - SearchConditionMediaTypeContext _tmp47_; - sqlite3_stmt* _tmp48_; - const gchar* _tmp49_; - SearchConditionMediaTypeMediaType _tmp50_; - SearchConditionMediaType* _tmp51_; - GeeList* _tmp52_; - SearchConditionMediaType* _tmp53_; + sqlite3_stmt* _tmp36_; + const gchar* _tmp37_; + sqlite3_stmt* _tmp38_; + const gchar* _tmp39_; + sqlite3_stmt* _tmp40_; + const gchar* _tmp41_; + SearchConditionMediaType* _tmp42_; + GeeList* _tmp43_; + SearchConditionMediaType* _tmp44_; #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp36_) { -#line 3327 "SavedSearchDBTable.c" + if (!_tmp31_) { +#line 3262 "SavedSearchDBTable.c" } #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = FALSE; + _tmp31_ = FALSE; #line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = stmt; + _tmp32_ = stmt; #line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp38_ = sqlite3_step (_tmp37_); -#line 445 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp38_; + res = sqlite3_step (_tmp32_); #line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp39_ = res; + _tmp33_ = res; #line 446 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp39_ == SQLITE_DONE) { + if (_tmp33_ == SQLITE_DONE) { #line 447 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3343 "SavedSearchDBTable.c" +#line 3276 "SavedSearchDBTable.c" } else { - gint _tmp40_; + gint _tmp34_; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp40_ = res; + _tmp34_ = res; #line 448 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp40_ != SQLITE_ROW) { -#line 3350 "SavedSearchDBTable.c" - gint _tmp41_; + if (_tmp34_ != SQLITE_ROW) { +#line 3283 "SavedSearchDBTable.c" + gint _tmp35_; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp41_ = res; + _tmp35_ = res; #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp41_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_MediaType.get_all_rows", _tmp35_, &_inner_error_); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3367,7 +3300,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3368 "SavedSearchDBTable.c" +#line 3301 "SavedSearchDBTable.c" } else { #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3379,124 +3312,111 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 449 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3380 "SavedSearchDBTable.c" +#line 3313 "SavedSearchDBTable.c" } } } } #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp42_ = stmt; -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp43_ = sqlite3_column_text (_tmp42_, 0); -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp44_ = search_condition_search_type_from_string (_tmp43_); -#line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp45_ = stmt; + _tmp36_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp46_ = sqlite3_column_text (_tmp45_, 1); + _tmp37_ = sqlite3_column_text (_tmp36_, 0); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp47_ = search_condition_media_type_context_from_string (_tmp46_); + _tmp38_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp48_ = stmt; + _tmp39_ = sqlite3_column_text (_tmp38_, 1); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp49_ = sqlite3_column_text (_tmp48_, 2); + _tmp40_ = stmt; #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp50_ = search_condition_media_type_media_type_from_string (_tmp49_); + _tmp41_ = sqlite3_column_text (_tmp40_, 2); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp51_ = search_condition_media_type_new (_tmp44_, _tmp47_, _tmp50_); + _tmp42_ = search_condition_media_type_new (search_condition_search_type_from_string (_tmp37_), search_condition_media_type_context_from_string (_tmp39_), search_condition_media_type_media_type_from_string (_tmp41_)); #line 451 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp51_; + condition = _tmp42_; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp52_ = list; + _tmp43_ = list; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp53_ = condition; + _tmp44_ = condition; #line 456 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 444 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3415 "SavedSearchDBTable.c" +#line 3342 "SavedSearchDBTable.c" } } #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp54_ = database_table_db; + _tmp45_ = database_table_db; #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp56_ = sqlite3_prepare_v2 (_tmp54_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp55_, NULL); + _tmp47_ = sqlite3_prepare_v2 (_tmp45_, "SELECT search_type, flag_state FROM SavedSearchDBTable_Flagged " "WHERE search_id=?", -1, &_tmp46_, NULL); #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp55_; + stmt = _tmp46_; #line 460 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp56_; + res = _tmp47_; #line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp57_ = res; + _tmp48_ = res; #line 463 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp57_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK"); #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp58_ = stmt; + _tmp49_ = stmt; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp59_ = *search_id; + _tmp50_ = *search_id; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp60_ = _tmp59_.id; + _tmp51_ = _tmp50_.id; #line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp61_ = sqlite3_bind_int64 (_tmp58_, 1, _tmp60_); -#line 465 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp61_; + res = sqlite3_bind_int64 (_tmp49_, 1, _tmp51_); #line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp62_ = res; + _tmp52_ = res; #line 466 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp62_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3446 "SavedSearchDBTable.c" + _vala_assert (_tmp52_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3371 "SavedSearchDBTable.c" { - gboolean _tmp63_ = FALSE; + gboolean _tmp53_ = FALSE; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = TRUE; + _tmp53_ = TRUE; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3453 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp64_; - gint _tmp65_; - gint _tmp66_; +#line 3378 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp54_; + gint _tmp55_; SearchConditionFlagged* condition = NULL; - sqlite3_stmt* _tmp69_; - const gchar* _tmp70_; - SearchConditionSearchType _tmp71_; - sqlite3_stmt* _tmp72_; - const gchar* _tmp73_; - SearchConditionFlaggedState _tmp74_; - SearchConditionFlagged* _tmp75_; - GeeList* _tmp76_; - SearchConditionFlagged* _tmp77_; + sqlite3_stmt* _tmp58_; + const gchar* _tmp59_; + sqlite3_stmt* _tmp60_; + const gchar* _tmp61_; + SearchConditionFlagged* _tmp62_; + GeeList* _tmp63_; + SearchConditionFlagged* _tmp64_; #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp63_) { -#line 3469 "SavedSearchDBTable.c" + if (!_tmp53_) { +#line 3391 "SavedSearchDBTable.c" } #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp63_ = FALSE; -#line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp64_ = stmt; + _tmp53_ = FALSE; #line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp65_ = sqlite3_step (_tmp64_); + _tmp54_ = stmt; #line 469 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp65_; + res = sqlite3_step (_tmp54_); #line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp66_ = res; + _tmp55_ = res; #line 470 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp66_ == SQLITE_DONE) { + if (_tmp55_ == SQLITE_DONE) { #line 471 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3485 "SavedSearchDBTable.c" +#line 3405 "SavedSearchDBTable.c" } else { - gint _tmp67_; + gint _tmp56_; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp67_ = res; + _tmp56_ = res; #line 472 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp67_ != SQLITE_ROW) { -#line 3492 "SavedSearchDBTable.c" - gint _tmp68_; + if (_tmp56_ != SQLITE_ROW) { +#line 3412 "SavedSearchDBTable.c" + gint _tmp57_; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp68_ = res; + _tmp57_ = res; #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp68_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Flagged.get_all_rows", _tmp57_, &_inner_error_); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3509,7 +3429,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3510 "SavedSearchDBTable.c" +#line 3430 "SavedSearchDBTable.c" } else { #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3521,122 +3441,110 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 473 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3522 "SavedSearchDBTable.c" +#line 3442 "SavedSearchDBTable.c" } } } } #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp69_ = stmt; + _tmp58_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp70_ = sqlite3_column_text (_tmp69_, 0); + _tmp59_ = sqlite3_column_text (_tmp58_, 0); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp71_ = search_condition_search_type_from_string (_tmp70_); -#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp72_ = stmt; -#line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp73_ = sqlite3_column_text (_tmp72_, 1); + _tmp60_ = stmt; #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp74_ = search_condition_flagged_state_from_string (_tmp73_); + _tmp61_ = sqlite3_column_text (_tmp60_, 1); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp75_ = search_condition_flagged_new (_tmp71_, _tmp74_); + _tmp62_ = search_condition_flagged_new (search_condition_search_type_from_string (_tmp59_), search_condition_flagged_state_from_string (_tmp61_)); #line 475 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp75_; + condition = _tmp62_; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp76_ = list; + _tmp63_ = list; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp77_ = condition; + _tmp64_ = condition; #line 479 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 468 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3551 "SavedSearchDBTable.c" +#line 3467 "SavedSearchDBTable.c" } } #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp78_ = database_table_db; + _tmp65_ = database_table_db; #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp80_ = sqlite3_prepare_v2 (_tmp78_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \ -"dified " "WHERE search_id=?", -1, &_tmp79_, NULL); + _tmp67_ = sqlite3_prepare_v2 (_tmp65_, "SELECT search_type, context, modified_state FROM SavedSearchDBTable_Mo" \ +"dified " "WHERE search_id=?", -1, &_tmp66_, NULL); #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp79_; + stmt = _tmp66_; #line 483 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp80_; + res = _tmp67_; #line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp81_ = res; + _tmp68_ = res; #line 486 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp81_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK"); #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp82_ = stmt; + _tmp69_ = stmt; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp83_ = *search_id; + _tmp70_ = *search_id; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp84_ = _tmp83_.id; + _tmp71_ = _tmp70_.id; #line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp85_ = sqlite3_bind_int64 (_tmp82_, 1, _tmp84_); -#line 488 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp85_; + res = sqlite3_bind_int64 (_tmp69_, 1, _tmp71_); #line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp86_ = res; + _tmp72_ = res; #line 489 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3582 "SavedSearchDBTable.c" + _vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3496 "SavedSearchDBTable.c" { - gboolean _tmp87_ = FALSE; + gboolean _tmp73_ = FALSE; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = TRUE; + _tmp73_ = TRUE; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3589 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp88_; - gint _tmp89_; - gint _tmp90_; +#line 3503 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp74_; + gint _tmp75_; SearchConditionModified* condition = NULL; - sqlite3_stmt* _tmp93_; - const gchar* _tmp94_; - SearchConditionSearchType _tmp95_; - sqlite3_stmt* _tmp96_; - const gchar* _tmp97_; - SearchConditionModifiedContext _tmp98_; - sqlite3_stmt* _tmp99_; - const gchar* _tmp100_; - SearchConditionModifiedState _tmp101_; - SearchConditionModified* _tmp102_; - GeeList* _tmp103_; - SearchConditionModified* _tmp104_; + sqlite3_stmt* _tmp78_; + const gchar* _tmp79_; + sqlite3_stmt* _tmp80_; + const gchar* _tmp81_; + sqlite3_stmt* _tmp82_; + const gchar* _tmp83_; + SearchConditionModified* _tmp84_; + GeeList* _tmp85_; + SearchConditionModified* _tmp86_; #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp87_) { -#line 3608 "SavedSearchDBTable.c" + if (!_tmp73_) { +#line 3518 "SavedSearchDBTable.c" } #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp87_ = FALSE; + _tmp73_ = FALSE; #line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp88_ = stmt; + _tmp74_ = stmt; #line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp89_ = sqlite3_step (_tmp88_); -#line 492 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp89_; + res = sqlite3_step (_tmp74_); #line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp90_ = res; + _tmp75_ = res; #line 493 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp90_ == SQLITE_DONE) { + if (_tmp75_ == SQLITE_DONE) { #line 494 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3624 "SavedSearchDBTable.c" +#line 3532 "SavedSearchDBTable.c" } else { - gint _tmp91_; + gint _tmp76_; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp91_ = res; + _tmp76_ = res; #line 495 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp91_ != SQLITE_ROW) { -#line 3631 "SavedSearchDBTable.c" - gint _tmp92_; + if (_tmp76_ != SQLITE_ROW) { +#line 3539 "SavedSearchDBTable.c" + gint _tmp77_; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp92_ = res; + _tmp77_ = res; #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp92_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Modified.get_all_rows", _tmp77_, &_inner_error_); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3649,7 +3557,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3649 "SavedSearchDBTable.c" +#line 3557 "SavedSearchDBTable.c" } else { #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3661,127 +3569,112 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 496 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3661 "SavedSearchDBTable.c" +#line 3569 "SavedSearchDBTable.c" } } } } #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp93_ = stmt; -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp94_ = sqlite3_column_text (_tmp93_, 0); + _tmp78_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp95_ = search_condition_search_type_from_string (_tmp94_); + _tmp79_ = sqlite3_column_text (_tmp78_, 0); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp96_ = stmt; -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp97_ = sqlite3_column_text (_tmp96_, 1); -#line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp98_ = search_condition_modified_context_from_string (_tmp97_); + _tmp80_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp99_ = stmt; + _tmp81_ = sqlite3_column_text (_tmp80_, 1); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp100_ = sqlite3_column_text (_tmp99_, 2); + _tmp82_ = stmt; #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp101_ = search_condition_modified_state_from_string (_tmp100_); + _tmp83_ = sqlite3_column_text (_tmp82_, 2); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp102_ = search_condition_modified_new (_tmp95_, _tmp98_, _tmp101_); + _tmp84_ = search_condition_modified_new (search_condition_search_type_from_string (_tmp79_), search_condition_modified_context_from_string (_tmp81_), search_condition_modified_state_from_string (_tmp83_)); #line 498 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp102_; + condition = _tmp84_; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp103_ = list; + _tmp85_ = list; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp104_ = condition; + _tmp86_ = condition; #line 503 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 491 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3696 "SavedSearchDBTable.c" +#line 3598 "SavedSearchDBTable.c" } } #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp105_ = database_table_db; + _tmp87_ = database_table_db; #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp107_ = sqlite3_prepare_v2 (_tmp105_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp106_, NULL); + _tmp89_ = sqlite3_prepare_v2 (_tmp87_, "SELECT search_type, rating, context FROM SavedSearchDBTable_Rating " "WHERE search_id=?", -1, &_tmp88_, NULL); #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp106_; + stmt = _tmp88_; #line 507 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp107_; + res = _tmp89_; #line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp108_ = res; + _tmp90_ = res; #line 510 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK"); + _vala_assert (_tmp90_ == SQLITE_OK, "res == Sqlite.OK"); #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp109_ = stmt; + _tmp91_ = stmt; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp110_ = *search_id; + _tmp92_ = *search_id; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp111_ = _tmp110_.id; + _tmp93_ = _tmp92_.id; #line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp112_ = sqlite3_bind_int64 (_tmp109_, 1, _tmp111_); -#line 512 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp112_; + res = sqlite3_bind_int64 (_tmp91_, 1, _tmp93_); #line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp113_ = res; + _tmp94_ = res; #line 513 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp113_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3727 "SavedSearchDBTable.c" + _vala_assert (_tmp94_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3627 "SavedSearchDBTable.c" { - gboolean _tmp114_ = FALSE; + gboolean _tmp95_ = FALSE; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = TRUE; + _tmp95_ = TRUE; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3734 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp115_; - gint _tmp116_; - gint _tmp117_; +#line 3634 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp96_; + gint _tmp97_; SearchConditionRating* condition = NULL; - sqlite3_stmt* _tmp120_; - const gchar* _tmp121_; - SearchConditionSearchType _tmp122_; - sqlite3_stmt* _tmp123_; - gint _tmp124_; - Rating _tmp125_; - sqlite3_stmt* _tmp126_; - const gchar* _tmp127_; - SearchConditionRatingContext _tmp128_; - SearchConditionRating* _tmp129_; - GeeList* _tmp130_; - SearchConditionRating* _tmp131_; + sqlite3_stmt* _tmp100_; + const gchar* _tmp101_; + sqlite3_stmt* _tmp102_; + sqlite3_stmt* _tmp103_; + const gchar* _tmp104_; + SearchConditionRating* _tmp105_; + GeeList* _tmp106_; + SearchConditionRating* _tmp107_; #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp114_) { -#line 3753 "SavedSearchDBTable.c" + if (!_tmp95_) { +#line 3648 "SavedSearchDBTable.c" } #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp114_ = FALSE; -#line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp115_ = stmt; + _tmp95_ = FALSE; #line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp116_ = sqlite3_step (_tmp115_); + _tmp96_ = stmt; #line 516 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp116_; + res = sqlite3_step (_tmp96_); #line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp117_ = res; + _tmp97_ = res; #line 517 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp117_ == SQLITE_DONE) { + if (_tmp97_ == SQLITE_DONE) { #line 518 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3769 "SavedSearchDBTable.c" +#line 3662 "SavedSearchDBTable.c" } else { - gint _tmp118_; + gint _tmp98_; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp118_ = res; + _tmp98_ = res; #line 519 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp118_ != SQLITE_ROW) { -#line 3776 "SavedSearchDBTable.c" - gint _tmp119_; + if (_tmp98_ != SQLITE_ROW) { +#line 3669 "SavedSearchDBTable.c" + gint _tmp99_; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp119_ = res; + _tmp99_ = res; #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp119_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Rating.get_all_rows", _tmp99_, &_inner_error_); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3794,7 +3687,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3794 "SavedSearchDBTable.c" +#line 3687 "SavedSearchDBTable.c" } else { #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3806,134 +3699,117 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 520 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3806 "SavedSearchDBTable.c" +#line 3699 "SavedSearchDBTable.c" } } } } #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp120_ = stmt; -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp121_ = sqlite3_column_text (_tmp120_, 0); -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp122_ = search_condition_search_type_from_string (_tmp121_); + _tmp100_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp123_ = stmt; -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp124_ = sqlite3_column_int (_tmp123_, 1); + _tmp101_ = sqlite3_column_text (_tmp100_, 0); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp125_ = rating_unserialize (_tmp124_); + _tmp102_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp126_ = stmt; + _tmp103_ = stmt; #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp127_ = sqlite3_column_text (_tmp126_, 2); + _tmp104_ = sqlite3_column_text (_tmp103_, 2); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp128_ = search_condition_rating_context_from_string (_tmp127_); + _tmp105_ = search_condition_rating_new (search_condition_search_type_from_string (_tmp101_), rating_unserialize (sqlite3_column_int (_tmp102_, 1)), search_condition_rating_context_from_string (_tmp104_)); #line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp129_ = search_condition_rating_new (_tmp122_, _tmp125_, _tmp128_); -#line 522 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp129_; + condition = _tmp105_; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp130_ = list; + _tmp106_ = list; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp131_ = condition; + _tmp107_ = condition; #line 527 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 515 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 3841 "SavedSearchDBTable.c" +#line 3726 "SavedSearchDBTable.c" } } #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp132_ = database_table_db; + _tmp108_ = database_table_db; #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp134_ = sqlite3_prepare_v2 (_tmp132_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \ -"e_Date " "WHERE search_id=?", -1, &_tmp133_, NULL); + _tmp110_ = sqlite3_prepare_v2 (_tmp108_, "SELECT search_type, context, date_one, date_two FROM SavedSearchDBTabl" \ +"e_Date " "WHERE search_id=?", -1, &_tmp109_, NULL); #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - stmt = _tmp133_; + stmt = _tmp109_; #line 531 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp134_; + res = _tmp110_; #line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp135_ = res; + _tmp111_ = res; #line 534 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp135_ == SQLITE_OK, "res == Sqlite.OK"); -#line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp136_ = stmt; + _vala_assert (_tmp111_ == SQLITE_OK, "res == Sqlite.OK"); #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp137_ = *search_id; + _tmp112_ = stmt; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp138_ = _tmp137_.id; + _tmp113_ = *search_id; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp139_ = sqlite3_bind_int64 (_tmp136_, 1, _tmp138_); + _tmp114_ = _tmp113_.id; #line 536 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp139_; + res = sqlite3_bind_int64 (_tmp112_, 1, _tmp114_); #line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp140_ = res; + _tmp115_ = res; #line 537 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp140_ == SQLITE_OK, "res == Sqlite.OK"); -#line 3872 "SavedSearchDBTable.c" + _vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK"); +#line 3755 "SavedSearchDBTable.c" { - gboolean _tmp141_ = FALSE; + gboolean _tmp116_ = FALSE; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = TRUE; + _tmp116_ = TRUE; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 3879 "SavedSearchDBTable.c" - sqlite3_stmt* _tmp142_; - gint _tmp143_; - gint _tmp144_; +#line 3762 "SavedSearchDBTable.c" + sqlite3_stmt* _tmp117_; + gint _tmp118_; SearchConditionDate* condition = NULL; - sqlite3_stmt* _tmp147_; - const gchar* _tmp148_; - SearchConditionSearchType _tmp149_; - sqlite3_stmt* _tmp150_; - const gchar* _tmp151_; - SearchConditionDateContext _tmp152_; - sqlite3_stmt* _tmp153_; - gint64 _tmp154_; - GDateTime* _tmp155_; - GDateTime* _tmp156_; - sqlite3_stmt* _tmp157_; - gint64 _tmp158_; - GDateTime* _tmp159_; - GDateTime* _tmp160_; - SearchConditionDate* _tmp161_; - SearchConditionDate* _tmp162_; - GeeList* _tmp163_; - SearchConditionDate* _tmp164_; + sqlite3_stmt* _tmp121_; + const gchar* _tmp122_; + sqlite3_stmt* _tmp123_; + const gchar* _tmp124_; + sqlite3_stmt* _tmp125_; + GDateTime* _tmp126_; + GDateTime* _tmp127_; + sqlite3_stmt* _tmp128_; + GDateTime* _tmp129_; + GDateTime* _tmp130_; + SearchConditionDate* _tmp131_; + SearchConditionDate* _tmp132_; + GeeList* _tmp133_; + SearchConditionDate* _tmp134_; #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!_tmp141_) { -#line 3904 "SavedSearchDBTable.c" + if (!_tmp116_) { +#line 3782 "SavedSearchDBTable.c" } #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp141_ = FALSE; -#line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp142_ = stmt; + _tmp116_ = FALSE; #line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp143_ = sqlite3_step (_tmp142_); + _tmp117_ = stmt; #line 540 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp143_; + res = sqlite3_step (_tmp117_); #line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp144_ = res; + _tmp118_ = res; #line 541 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp144_ == SQLITE_DONE) { + if (_tmp118_ == SQLITE_DONE) { #line 542 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 3920 "SavedSearchDBTable.c" +#line 3796 "SavedSearchDBTable.c" } else { - gint _tmp145_; + gint _tmp119_; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp145_ = res; + _tmp119_ = res; #line 543 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp145_ != SQLITE_ROW) { -#line 3927 "SavedSearchDBTable.c" - gint _tmp146_; + if (_tmp119_ != SQLITE_ROW) { +#line 3803 "SavedSearchDBTable.c" + gint _tmp120_; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp146_ = res; + _tmp120_ = res; #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp146_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable_Date.get_all_rows", _tmp120_, &_inner_error_); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -3946,7 +3822,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _g_object_unref0 (list); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3945 "SavedSearchDBTable.c" +#line 3821 "SavedSearchDBTable.c" } else { #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -3958,58 +3834,50 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* g_clear_error (&_inner_error_); #line 544 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 3957 "SavedSearchDBTable.c" +#line 3833 "SavedSearchDBTable.c" } } } } #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp147_ = stmt; -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp148_ = sqlite3_column_text (_tmp147_, 0); + _tmp121_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp149_ = search_condition_search_type_from_string (_tmp148_); + _tmp122_ = sqlite3_column_text (_tmp121_, 0); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp150_ = stmt; -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp151_ = sqlite3_column_text (_tmp150_, 1); -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp152_ = search_condition_date_context_from_string (_tmp151_); -#line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp153_ = stmt; + _tmp123_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp154_ = sqlite3_column_int64 (_tmp153_, 2); + _tmp124_ = sqlite3_column_text (_tmp123_, 1); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp155_ = g_date_time_new_from_unix_local (_tmp154_); + _tmp125_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp156_ = _tmp155_; + _tmp126_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp125_, 2)); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp157_ = stmt; + _tmp127_ = _tmp126_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp158_ = sqlite3_column_int64 (_tmp157_, 3); + _tmp128_ = stmt; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp159_ = g_date_time_new_from_unix_local (_tmp158_); + _tmp129_ = g_date_time_new_from_unix_local (sqlite3_column_int64 (_tmp128_, 3)); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp160_ = _tmp159_; + _tmp130_ = _tmp129_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp161_ = search_condition_date_new (_tmp149_, _tmp152_, _tmp156_, _tmp160_); + _tmp131_ = search_condition_date_new (search_condition_search_type_from_string (_tmp122_), search_condition_date_context_from_string (_tmp124_), _tmp127_, _tmp130_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp162_ = _tmp161_; + _tmp132_ = _tmp131_; #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_date_time_unref0 (_tmp160_); + _g_date_time_unref0 (_tmp130_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_date_time_unref0 (_tmp156_); + _g_date_time_unref0 (_tmp127_); #line 546 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - condition = _tmp162_; + condition = _tmp132_; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp163_ = list; + _tmp133_ = list; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp164_ = condition; + _tmp134_ = condition; #line 551 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp164_, TYPE_SEARCH_CONDITION, SearchCondition)); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_SEARCH_CONDITION, SearchCondition)); #line 539 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (condition); -#line 4008 "SavedSearchDBTable.c" +#line 3876 "SavedSearchDBTable.c" } } #line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4018,11 +3886,16 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable* _sqlite3_finalize0 (stmt); #line 554 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4017 "SavedSearchDBTable.c" +#line 3885 "SavedSearchDBTable.c" } -void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error) { +void +saved_search_db_table_create_from_row (SavedSearchDBTable* self, + SavedSearchRow* row, + SavedSearchID* result, + GError** error) +{ sqlite3_stmt* stmt = NULL; gint res = 0; sqlite3* _tmp0_; @@ -4030,25 +3903,19 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc gint _tmp2_; gint _tmp3_; sqlite3_stmt* _tmp4_; - SavedSearchRow* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - GDestroyNotify _tmp8_; - gint _tmp9_; - gint _tmp10_; - sqlite3_stmt* _tmp11_; - SavedSearchRow* _tmp12_; - SearchOperator _tmp13_; - gchar* _tmp14_; - GDestroyNotify _tmp15_; - gint _tmp16_; - gint _tmp17_; - sqlite3_stmt* _tmp18_; - gint _tmp19_; - gint _tmp20_; + const gchar* _tmp5_; + gchar* _tmp6_; + GDestroyNotify _tmp7_; + gint _tmp8_; + sqlite3_stmt* _tmp9_; + SearchOperator _tmp10_; + gchar* _tmp11_; + GDestroyNotify _tmp12_; + gint _tmp13_; + sqlite3_stmt* _tmp14_; + gint _tmp15_; SavedSearchID search_id = {0}; - sqlite3* _tmp22_; - gint64 _tmp23_; + sqlite3* _tmp17_; GError * _inner_error_ = NULL; #line 558 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4071,55 +3938,45 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp4_ = stmt; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp5_ = row; -#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp6_ = _tmp5_->name; -#line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = row->name; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = g_free; + _tmp6_ = g_strdup (_tmp5_); #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = sqlite3_bind_text (_tmp4_, 1, _tmp7_, -1, _tmp8_); + _tmp7_ = g_free; #line 564 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp9_; + res = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_); #line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = res; + _tmp8_ = res; #line 565 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp10_ == SQLITE_OK, "res == Sqlite.OK"); -#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = stmt; -#line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = row; + _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = _tmp12_->operator; + _tmp9_ = stmt; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = search_operator_to_string (_tmp13_); + _tmp10_ = row->operator; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = g_free; + _tmp11_ = search_operator_to_string (_tmp10_); #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = sqlite3_bind_text (_tmp11_, 2, _tmp14_, -1, _tmp15_); + _tmp12_ = g_free; #line 566 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp16_; + res = sqlite3_bind_text (_tmp9_, 2, _tmp11_, -1, _tmp12_); #line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = res; + _tmp13_ = res; #line 567 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK"); -#line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = stmt; + _vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK"); #line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = sqlite3_step (_tmp18_); + _tmp14_ = stmt; #line 569 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp19_; + res = sqlite3_step (_tmp14_); #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = res; + _tmp15_ = res; #line 570 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp20_ != SQLITE_DONE) { -#line 4113 "SavedSearchDBTable.c" - gint _tmp21_; + if (_tmp15_ != SQLITE_DONE) { +#line 3970 "SavedSearchDBTable.c" + gint _tmp16_; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = res; + _tmp16_ = res; #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp21_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.create_from_row", _tmp16_, &_inner_error_); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4130,7 +3987,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4129 "SavedSearchDBTable.c" +#line 3986 "SavedSearchDBTable.c" } else { #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -4140,85 +3997,80 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc g_clear_error (&_inner_error_); #line 571 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4139 "SavedSearchDBTable.c" +#line 3996 "SavedSearchDBTable.c" } } } #line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = database_table_db; -#line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_last_insert_rowid (_tmp22_); + _tmp17_ = database_table_db; #line 573 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&search_id, _tmp23_); -#line 4149 "SavedSearchDBTable.c" + saved_search_id_init (&search_id, sqlite3_last_insert_rowid (_tmp17_)); +#line 4004 "SavedSearchDBTable.c" { GeeList* _sc_list = NULL; - SavedSearchRow* _tmp24_; - GeeList* _tmp25_; - GeeList* _tmp26_; + GeeList* _tmp18_; + GeeList* _tmp19_; gint _sc_size = 0; - GeeList* _tmp27_; - gint _tmp28_; - gint _tmp29_; + GeeList* _tmp20_; + gint _tmp21_; + gint _tmp22_; gint _sc_index = 0; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; -#line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = _tmp24_->conditions; + _tmp18_ = row->conditions; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp19_ = _g_object_ref0 (_tmp18_); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_list = _tmp26_; + _sc_list = _tmp19_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = _sc_list; + _tmp20_ = _sc_list; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_size = _tmp29_; + _sc_size = _tmp22_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sc_index = -1; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 4180 "SavedSearchDBTable.c" - gint _tmp30_; - gint _tmp31_; - gint _tmp32_; +#line 4032 "SavedSearchDBTable.c" + gint _tmp23_; + gint _tmp24_; + gint _tmp25_; SearchCondition* sc = NULL; - GeeList* _tmp33_; - gint _tmp34_; - gpointer _tmp35_; - SavedSearchID _tmp36_; - SearchCondition* _tmp37_; + GeeList* _tmp26_; + gint _tmp27_; + gpointer _tmp28_; + SavedSearchID _tmp29_; + SearchCondition* _tmp30_; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = _sc_index; + _tmp23_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _sc_index = _tmp30_ + 1; + _sc_index = _tmp23_ + 1; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp31_ = _sc_index; + _tmp24_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp32_ = _sc_size; + _tmp25_ = _sc_size; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (!(_tmp31_ < _tmp32_)) { + if (!(_tmp24_ < _tmp25_)) { #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 4202 "SavedSearchDBTable.c" +#line 4054 "SavedSearchDBTable.c" } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp33_ = _sc_list; + _tmp26_ = _sc_list; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp34_ = _sc_index; + _tmp27_ = _sc_index; #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp35_ = gee_list_get (_tmp33_, _tmp34_); + _tmp28_ = gee_list_get (_tmp26_, _tmp27_); #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - sc = (SearchCondition*) _tmp35_; + sc = (SearchCondition*) _tmp28_; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp36_ = search_id; + _tmp29_ = search_id; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp37_ = sc; + _tmp30_ = sc; #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_db_table_add_condition (self, &_tmp36_, _tmp37_, &_inner_error_); + saved_search_db_table_add_condition (self, &_tmp29_, _tmp30_, &_inner_error_); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4233,7 +4085,7 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4232 "SavedSearchDBTable.c" +#line 4084 "SavedSearchDBTable.c" } else { #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); @@ -4247,16 +4099,16 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc g_clear_error (&_inner_error_); #line 576 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4246 "SavedSearchDBTable.c" +#line 4098 "SavedSearchDBTable.c" } } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _search_condition_unref0 (sc); -#line 4251 "SavedSearchDBTable.c" +#line 4103 "SavedSearchDBTable.c" } #line 575 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (_sc_list); -#line 4255 "SavedSearchDBTable.c" +#line 4107 "SavedSearchDBTable.c" } #line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" *result = search_id; @@ -4264,11 +4116,15 @@ void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearc _sqlite3_finalize0 (stmt); #line 579 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4263 "SavedSearchDBTable.c" +#line 4115 "SavedSearchDBTable.c" } -void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +void +saved_search_db_table_remove (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchID _tmp0_; SavedSearchID _tmp1_; gint64 _tmp2_; @@ -4289,7 +4145,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4288 "SavedSearchDBTable.c" +#line 4144 "SavedSearchDBTable.c" } else { #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4297,7 +4153,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 583 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4296 "SavedSearchDBTable.c" +#line 4152 "SavedSearchDBTable.c" } } #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4314,7 +4170,7 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4313 "SavedSearchDBTable.c" +#line 4169 "SavedSearchDBTable.c" } else { #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4322,13 +4178,17 @@ void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 584 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4321 "SavedSearchDBTable.c" +#line 4177 "SavedSearchDBTable.c" } } } -SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error) { +SavedSearchRow* +saved_search_db_table_get_row (SavedSearchDBTable* self, + SavedSearchID* search_id, + GError** error) +{ SavedSearchRow* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4340,22 +4200,19 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe SavedSearchID _tmp5_; gint64 _tmp6_; gint _tmp7_; - gint _tmp8_; - sqlite3_stmt* _tmp9_; - gint _tmp10_; - gint _tmp11_; + sqlite3_stmt* _tmp8_; + gint _tmp9_; SavedSearchRow* row = NULL; - SavedSearchRow* _tmp14_; + SavedSearchRow* _tmp12_; + SavedSearchRow* _tmp13_; + SavedSearchID _tmp14_; SavedSearchRow* _tmp15_; - SavedSearchID _tmp16_; - SavedSearchRow* _tmp17_; - sqlite3_stmt* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; - SavedSearchRow* _tmp21_; - sqlite3_stmt* _tmp22_; - const gchar* _tmp23_; - SearchOperator _tmp24_; + sqlite3_stmt* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + SavedSearchRow* _tmp19_; + sqlite3_stmt* _tmp20_; + const gchar* _tmp21_; GError * _inner_error_ = NULL; #line 587 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DB_TABLE (self), NULL); @@ -4382,42 +4239,38 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe #line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp6_ = _tmp5_.id; #line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); -#line 593 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp7_; + res = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_); #line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 594 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK"); -#line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = stmt; + _vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK"); #line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = sqlite3_step (_tmp9_); + _tmp8_ = stmt; #line 596 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp10_; + res = sqlite3_step (_tmp8_); #line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = res; + _tmp9_ = res; #line 597 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp11_ == SQLITE_DONE) { + if (_tmp9_ == SQLITE_DONE) { #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = NULL; #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 598 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4404 "SavedSearchDBTable.c" +#line 4257 "SavedSearchDBTable.c" } else { - gint _tmp12_; + gint _tmp10_; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = res; + _tmp10_ = res; #line 599 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp12_ != SQLITE_ROW) { -#line 4411 "SavedSearchDBTable.c" - gint _tmp13_; + if (_tmp10_ != SQLITE_ROW) { +#line 4264 "SavedSearchDBTable.c" + gint _tmp11_; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = res; + _tmp11_ = res; #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.get_row", _tmp13_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.get_row", _tmp11_, &_inner_error_); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4428,7 +4281,7 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe _sqlite3_finalize0 (stmt); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4427 "SavedSearchDBTable.c" +#line 4280 "SavedSearchDBTable.c" } else { #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); @@ -4438,54 +4291,55 @@ SavedSearchRow* saved_search_db_table_get_row (SavedSearchDBTable* self, SavedSe g_clear_error (&_inner_error_); #line 600 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4437 "SavedSearchDBTable.c" +#line 4290 "SavedSearchDBTable.c" } } } } #line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = saved_search_row_new (); + _tmp12_ = saved_search_row_new (); #line 602 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp14_; + row = _tmp12_; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = *search_id; + _tmp14_ = *search_id; #line 603 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_->search_id = _tmp16_; + _tmp13_->search_id = _tmp14_; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = row; + _tmp15_ = row; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = stmt; + _tmp16_ = stmt; #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = sqlite3_column_text (_tmp18_, 0); + _tmp17_ = sqlite3_column_text (_tmp16_, 0); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp18_ = g_strdup (_tmp17_); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp17_->name); + _g_free0 (_tmp15_->name); #line 604 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_->name = _tmp20_; -#line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = row; + _tmp15_->name = _tmp18_; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = stmt; + _tmp19_ = row; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = sqlite3_column_text (_tmp22_, 1); + _tmp20_ = stmt; #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = search_operator_from_string (_tmp23_); + _tmp21_ = sqlite3_column_text (_tmp20_, 1); #line 605 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_->operator = _tmp24_; + _tmp19_->operator = search_operator_from_string (_tmp21_); #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" result = row; #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _sqlite3_finalize0 (stmt); #line 607 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4480 "SavedSearchDBTable.c" +#line 4331 "SavedSearchDBTable.c" } -GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error) { +GeeList* +saved_search_db_table_get_all_rows (SavedSearchDBTable* self, + GError** error) +{ GeeList* result = NULL; sqlite3_stmt* stmt = NULL; gint res = 0; @@ -4516,69 +4370,64 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, (GDestroyNotify) saved_search_row_unref, NULL, NULL, NULL); #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList); -#line 4515 "SavedSearchDBTable.c" +#line 4369 "SavedSearchDBTable.c" { gboolean _tmp5_ = FALSE; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp5_ = TRUE; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" while (TRUE) { -#line 4522 "SavedSearchDBTable.c" +#line 4376 "SavedSearchDBTable.c" sqlite3_stmt* _tmp6_; gint _tmp7_; - gint _tmp8_; SavedSearchRow* row = NULL; + SavedSearchRow* _tmp10_; SavedSearchRow* _tmp11_; - SavedSearchRow* _tmp12_; - sqlite3_stmt* _tmp13_; - gint64 _tmp14_; - SavedSearchRow* _tmp15_; - sqlite3_stmt* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - SavedSearchRow* _tmp19_; - sqlite3_stmt* _tmp20_; - const gchar* _tmp21_; - SearchOperator _tmp22_; - GeeList* _tmp23_ = NULL; + sqlite3_stmt* _tmp12_; + SavedSearchRow* _tmp13_; + sqlite3_stmt* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + SavedSearchRow* _tmp17_; + sqlite3_stmt* _tmp18_; + const gchar* _tmp19_; + GeeList* _tmp20_ = NULL; + SavedSearchRow* _tmp21_; + SavedSearchID _tmp22_; + GeeList* _tmp23_; SavedSearchRow* _tmp24_; - SavedSearchID _tmp25_; + GeeList* _tmp25_; GeeList* _tmp26_; SavedSearchRow* _tmp27_; - GeeList* _tmp28_; - GeeList* _tmp29_; - SavedSearchRow* _tmp30_; #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (!_tmp5_) { -#line 4549 "SavedSearchDBTable.c" +#line 4400 "SavedSearchDBTable.c" } #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp5_ = FALSE; #line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp6_ = stmt; #line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp7_ = sqlite3_step (_tmp6_); -#line 619 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - res = _tmp7_; + res = sqlite3_step (_tmp6_); #line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp8_ = res; + _tmp7_ = res; #line 620 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp8_ == SQLITE_DONE) { + if (_tmp7_ == SQLITE_DONE) { #line 621 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" break; -#line 4565 "SavedSearchDBTable.c" +#line 4414 "SavedSearchDBTable.c" } else { - gint _tmp9_; + gint _tmp8_; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp9_ = res; + _tmp8_ = res; #line 622 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - if (_tmp9_ != SQLITE_ROW) { -#line 4572 "SavedSearchDBTable.c" - gint _tmp10_; + if (_tmp8_ != SQLITE_ROW) { +#line 4421 "SavedSearchDBTable.c" + gint _tmp9_; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp10_ = res; + _tmp9_ = res; #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp10_, &_inner_error_); + database_table_throw_error ("SavedSearchDBTable.get_all_rows", _tmp9_, &_inner_error_); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4591,7 +4440,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4590 "SavedSearchDBTable.c" +#line 4439 "SavedSearchDBTable.c" } else { #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _g_object_unref0 (rows); @@ -4603,53 +4452,49 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** g_clear_error (&_inner_error_); #line 623 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4602 "SavedSearchDBTable.c" +#line 4451 "SavedSearchDBTable.c" } } } } #line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp11_ = saved_search_row_new (); + _tmp10_ = saved_search_row_new (); #line 625 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - row = _tmp11_; + row = _tmp10_; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp12_ = row; + _tmp11_ = row; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp13_ = stmt; + _tmp12_ = stmt; #line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp14_ = sqlite3_column_int64 (_tmp13_, 0); -#line 626 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - saved_search_id_init (&_tmp12_->search_id, _tmp14_); + saved_search_id_init (&_tmp11_->search_id, sqlite3_column_int64 (_tmp12_, 0)); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_ = row; + _tmp13_ = row; #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp16_ = stmt; + _tmp14_ = stmt; #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp17_ = sqlite3_column_text (_tmp16_, 1); + _tmp15_ = sqlite3_column_text (_tmp14_, 1); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = g_strdup (_tmp15_); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp13_->name); #line 627 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp15_->name = _tmp18_; -#line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_ = row; + _tmp13_->name = _tmp16_; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp20_ = stmt; + _tmp17_ = row; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp21_ = sqlite3_column_text (_tmp20_, 2); + _tmp18_ = stmt; #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp22_ = search_operator_from_string (_tmp21_); + _tmp19_ = sqlite3_column_text (_tmp18_, 2); #line 628 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp19_->operator = _tmp22_; + _tmp17_->operator = search_operator_from_string (_tmp19_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp24_ = row; + _tmp21_ = row; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp25_ = _tmp24_->search_id; + _tmp22_ = _tmp21_->search_id; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp26_ = saved_search_db_table_get_conditions_for_id (self, &_tmp25_, &_inner_error_); + _tmp23_ = saved_search_db_table_get_conditions_for_id (self, &_tmp22_, &_inner_error_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = _tmp26_; + _tmp20_ = _tmp23_; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4664,7 +4509,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4663 "SavedSearchDBTable.c" +#line 4508 "SavedSearchDBTable.c" } else { #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _saved_search_row_unref0 (row); @@ -4678,30 +4523,30 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** g_clear_error (&_inner_error_); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return NULL; -#line 4677 "SavedSearchDBTable.c" +#line 4522 "SavedSearchDBTable.c" } } #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_ = row; + _tmp24_ = row; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp28_ = _tmp23_; + _tmp25_ = _tmp20_; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp23_ = NULL; + _tmp20_ = NULL; #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp27_->conditions); + _g_object_unref0 (_tmp24_->conditions); #line 629 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp27_->conditions = _tmp28_; + _tmp24_->conditions = _tmp25_; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp29_ = rows; + _tmp26_ = rows; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp30_ = row; + _tmp27_ = row; #line 631 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _g_object_unref0 (_tmp23_); + _g_object_unref0 (_tmp20_); #line 618 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _saved_search_row_unref0 (row); -#line 4700 "SavedSearchDBTable.c" +#line 4545 "SavedSearchDBTable.c" } } #line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4710,14 +4555,18 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** _sqlite3_finalize0 (stmt); #line 634 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return result; -#line 4709 "SavedSearchDBTable.c" +#line 4554 "SavedSearchDBTable.c" } -void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error) { +void +saved_search_db_table_rename (SavedSearchDBTable* self, + SavedSearchID* search_id, + const gchar* new_name, + GError** error) +{ SavedSearchID _tmp0_; gint64 _tmp1_; - const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 637 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_return_if_fail (IS_SAVED_SEARCH_DB_TABLE (self)); @@ -4730,9 +4579,7 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" _tmp1_ = _tmp0_.id; #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - _tmp2_ = new_name; -#line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" - database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", _tmp2_, &_inner_error_); + database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "name", new_name, &_inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" @@ -4741,7 +4588,7 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear g_propagate_error (error, _inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4740 "SavedSearchDBTable.c" +#line 4587 "SavedSearchDBTable.c" } else { #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4749,36 +4596,44 @@ void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* sear g_clear_error (&_inner_error_); #line 638 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" return; -#line 4748 "SavedSearchDBTable.c" +#line 4595 "SavedSearchDBTable.c" } } } -static void saved_search_db_table_class_init (SavedSearchDBTableClass * klass) { +static void +saved_search_db_table_class_init (SavedSearchDBTableClass * klass) +{ #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" saved_search_db_table_parent_class = g_type_class_peek_parent (klass); #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" ((DatabaseTableClass *) klass)->finalize = saved_search_db_table_finalize; -#line 4759 "SavedSearchDBTable.c" +#line 4608 "SavedSearchDBTable.c" } -static void saved_search_db_table_instance_init (SavedSearchDBTable * self) { +static void +saved_search_db_table_instance_init (SavedSearchDBTable * self) +{ } -static void saved_search_db_table_finalize (DatabaseTable * obj) { +static void +saved_search_db_table_finalize (DatabaseTable * obj) +{ SavedSearchDBTable * self; #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DB_TABLE, SavedSearchDBTable); #line 33 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala" DATABASE_TABLE_CLASS (saved_search_db_table_parent_class)->finalize (obj); -#line 4773 "SavedSearchDBTable.c" +#line 4626 "SavedSearchDBTable.c" } -GType saved_search_db_table_get_type (void) { +GType +saved_search_db_table_get_type (void) +{ static volatile gsize saved_search_db_table_type_id__volatile = 0; if (g_once_init_enter (&saved_search_db_table_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDBTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_db_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDBTable), 0, (GInstanceInitFunc) saved_search_db_table_instance_init, NULL }; |