diff options
Diffstat (limited to 'src/searches/SavedSearchDialog.c')
-rw-r--r-- | src/searches/SavedSearchDialog.c | 4434 |
1 files changed, 2037 insertions, 2397 deletions
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c index 86fd417..09e5fec 100644 --- a/src/searches/SavedSearchDialog.c +++ b/src/searches/SavedSearchDialog.c @@ -15,7 +15,6 @@ #include <stdlib.h> #include <string.h> #include <glib/gi18n-lib.h> -#include <gdk/gdk.h> #include <gobject/gvaluecollector.h> @@ -285,30 +284,25 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow typedef struct _SearchConditionDate SearchConditionDate; typedef struct _SearchConditionDateClass SearchConditionDateClass; typedef struct _Block10Data Block10Data; -typedef struct _ParamSpecSavedSearchDialog ParamSpecSavedSearchDialog; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); struct _SavedSearchDialog { - GTypeInstance parent_instance; - volatile int ref_count; + GtkDialog parent_instance; SavedSearchDialogPrivate * priv; }; struct _SavedSearchDialogClass { - GTypeClass parent_class; - void (*finalize) (SavedSearchDialog *self); + GtkDialogClass parent_class; }; struct _SavedSearchDialogPrivate { - GtkBuilder* builder; - GtkDialog* dialog; GtkButton* add_criteria; GtkComboBoxText* operator; - GtkBox* row_box; GtkEntry* search_title; + GtkListBox* row_listbox; GeeArrayList* row_list; gboolean edit_mode; SavedSearch* previous_search; @@ -546,10 +540,6 @@ struct _Block10Data { GtkDialog* d; }; -struct _ParamSpecSavedSearchDialog { - GParamSpec parent_instance; -}; - static gpointer saved_search_dialog_parent_class = NULL; static gpointer saved_search_dialog_search_row_container_parent_class = NULL; @@ -561,12 +551,6 @@ static gpointer saved_search_dialog_search_row_flagged_parent_class = NULL; static gpointer saved_search_dialog_search_row_rating_parent_class = NULL; static gpointer saved_search_dialog_search_row_date_parent_class = NULL; -gpointer saved_search_dialog_ref (gpointer instance); -void saved_search_dialog_unref (gpointer instance); -GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_saved_search_dialog (GValue* value, gpointer v_object); -void value_take_saved_search_dialog (GValue* value, gpointer v_object); -gpointer value_get_saved_search_dialog (const GValue* value); GType saved_search_dialog_get_type (void) G_GNUC_CONST; static gpointer saved_search_dialog_search_row_container_ref (gpointer instance); static void saved_search_dialog_search_row_container_unref (gpointer instance); @@ -582,10 +566,9 @@ GType saved_search_get_type (void) G_GNUC_CONST; enum { SAVED_SEARCH_DIALOG_DUMMY_PROPERTY }; -static void saved_search_dialog_on_title_changed (SavedSearchDialog* self); -static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); SavedSearchDialog* saved_search_dialog_new (void); SavedSearchDialog* saved_search_dialog_construct (GType object_type); +gint resources_use_header_bar (void); static void saved_search_dialog_setup_dialog (SavedSearchDialog* self); gpointer saved_search_table_ref (gpointer instance); void saved_search_table_unref (gpointer instance); @@ -615,14 +598,15 @@ GeeList* saved_search_get_conditions (SavedSearch* self); static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc); -GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user); GType page_window_get_type (void) G_GNUC_CONST; GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id); static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event); -static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self); +static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void saved_search_dialog_on_title_changed (SavedSearchDialog* self); +static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); void saved_search_dialog_show (SavedSearchDialog* self); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void); static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type); @@ -661,8 +645,8 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array, gchar* search_condition_search_type_display_text (SearchConditionSearchType self); static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self); static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); -static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event); -static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self); +static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self); static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self); static GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self); static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent); @@ -818,100 +802,93 @@ static Block10Data* block10_data_ref (Block10Data* _data10_); static void block10_data_unref (void * _userdata_); #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define RESOURCES_OK_LABEL _ ("_OK") -static void __lambda13_ (SavedSearchDialogSearchRowDate* self); -static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); -static void __lambda14_ (Block10Data* _data10_); -static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); +static void __lambda14_ (SavedSearchDialogSearchRowDate* self); +static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); +static void __lambda15_ (Block10Data* _data10_); +static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self); static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj); -static void saved_search_dialog_finalize (SavedSearchDialog * obj); - - -static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_on_title_changed ((SavedSearchDialog*) self); -#line 833 "SavedSearchDialog.c" -} +static void saved_search_dialog_finalize (GObject * obj); SavedSearchDialog* saved_search_dialog_construct (GType object_type) { - SavedSearchDialog* self = NULL; - GtkEntry* _tmp0_; - SavedSearchTable* _tmp1_; + SavedSearchDialog * self = NULL; + gint _tmp0_; + GtkEntry* _tmp1_; SavedSearchTable* _tmp2_; - gchar* _tmp3_; + SavedSearchTable* _tmp3_; gchar* _tmp4_; - GtkEntry* _tmp5_; - GeeArrayList* _tmp6_; - gpointer _tmp7_; - SavedSearchDialogSearchRowContainer* _tmp8_; - GtkDialog* _tmp9_; -#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = (SavedSearchDialog*) g_type_create_instance (object_type); -#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_setup_dialog (self); -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = self->priv->search_title; -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = saved_search_table_get_instance (); -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = _tmp1_; -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = saved_search_table_generate_unique_name (_tmp2_); -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _tmp3_; -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_text (_tmp0_, _tmp4_); -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_free0 (_tmp4_); -#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_table_unref0 (_tmp2_); -#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->search_title; -#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1); -#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_add_text_search (self); -#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->row_list; -#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = (SavedSearchDialogSearchRowContainer*) _tmp7_; + gchar* _tmp5_; + GtkEntry* _tmp6_; + GeeArrayList* _tmp7_; + gpointer _tmp8_; + SavedSearchDialogSearchRowContainer* _tmp9_; #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_allow_removal (_tmp8_, FALSE); + _tmp0_ = resources_use_header_bar (); #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_dialog_search_row_container_unref0 (_tmp8_); -#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->dialog; + self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); #line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 660 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_setup_dialog (self); +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp1_ = self->priv->search_title; +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp2_ = saved_search_table_get_instance (); +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp3_ = _tmp2_; +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp4_ = saved_search_table_generate_unique_name (_tmp3_); +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp5_ = _tmp4_; +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_entry_set_text (_tmp1_, _tmp5_); +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _g_free0 (_tmp5_); +#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _saved_search_table_unref0 (_tmp3_); +#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp6_ = self->priv->search_title; +#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1); +#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_add_text_search (self); +#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp7_ = self->priv->row_list; +#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); +#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp9_ = (SavedSearchDialogSearchRowContainer*) _tmp8_; +#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_allow_removal (_tmp9_, FALSE); +#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _saved_search_dialog_search_row_container_unref0 (_tmp9_); +#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, FALSE); -#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 893 "SavedSearchDialog.c" +#line 870 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_new (void) { -#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG); -#line 900 "SavedSearchDialog.c" +#line 877 "SavedSearchDialog.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? g_object_ref (self) : NULL; -#line 907 "SavedSearchDialog.c" +#line 884 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) { - SavedSearchDialog* self = NULL; - SavedSearch* _tmp0_; + SavedSearchDialog * self = NULL; + gint _tmp0_; SavedSearch* _tmp1_; - GtkDialog* _tmp2_; + SavedSearch* _tmp2_; GtkComboBoxText* _tmp3_; SavedSearch* _tmp4_; SearchOperator _tmp5_; @@ -922,47 +899,47 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ GeeArrayList* _tmp24_; gint _tmp25_; gint _tmp26_; -#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL); -#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = (SavedSearchDialog*) g_type_create_instance (object_type); -#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = saved_search; -#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp0_ = resources_use_header_bar (); +#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL); +#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp1_ = saved_search; +#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp2_ = _g_object_ref0 (_tmp1_); +#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->previous_search); -#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->previous_search = _tmp1_; -#line 665 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self->priv->previous_search = _tmp2_; +#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->edit_mode = TRUE; -#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_setup_dialog (self); -#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = self->priv->dialog; -#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->operator; -#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = saved_search; -#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = saved_search_get_operator (_tmp4_); -#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) _tmp5_)); -#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->search_title; -#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = saved_search; -#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); -#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = _tmp8_; -#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_entry_set_text (_tmp6_, _tmp9_); -#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp9_); -#line 966 "SavedSearchDialog.c" +#line 943 "SavedSearchDialog.c" { GeeList* _sc_list = NULL; SavedSearch* _tmp10_; @@ -972,25 +949,25 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ gint _tmp13_; gint _tmp14_; gint _sc_index = 0; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = saved_search; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = saved_search_get_conditions (_tmp10_); -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _sc_list = _tmp11_; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _sc_list; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = _tmp13_; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _sc_size = _tmp14_; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _sc_index = -1; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 994 "SavedSearchDialog.c" +#line 971 "SavedSearchDialog.c" gint _tmp15_; gint _tmp16_; gint _tmp17_; @@ -1001,330 +978,183 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ SearchCondition* _tmp21_; SavedSearchDialogSearchRowContainer* _tmp22_; SavedSearchDialogSearchRowContainer* _tmp23_; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = _sc_index; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _sc_index = _tmp15_ + 1; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = _sc_index; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = _sc_size; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!(_tmp16_ < _tmp17_)) { -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1017 "SavedSearchDialog.c" +#line 994 "SavedSearchDialog.c" } -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = _sc_list; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = _sc_index; -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = gee_list_get (_tmp18_, _tmp19_); -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" sc = (SearchCondition*) _tmp20_; -#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = sc; -#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp21_); -#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp23_ = _tmp22_; -#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_add_row (self, _tmp23_); -#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp23_); -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (sc); -#line 1039 "SavedSearchDialog.c" +#line 1016 "SavedSearchDialog.c" } -#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_sc_list); -#line 1043 "SavedSearchDialog.c" +#line 1020 "SavedSearchDialog.c" } -#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->row_list; -#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp26_ = _tmp25_; -#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp26_ == 1) { -#line 1053 "SavedSearchDialog.c" +#line 1030 "SavedSearchDialog.c" GeeArrayList* _tmp27_; gpointer _tmp28_; SavedSearchDialogSearchRowContainer* _tmp29_; -#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp27_ = self->priv->row_list; -#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp29_ = (SavedSearchDialogSearchRowContainer*) _tmp28_; -#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE); -#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp29_); -#line 1067 "SavedSearchDialog.c" +#line 1044 "SavedSearchDialog.c" } -#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 692 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); -#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 1073 "SavedSearchDialog.c" +#line 1050 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) { -#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search); -#line 1080 "SavedSearchDialog.c" +#line 1057 "SavedSearchDialog.c" } static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { -#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id); -#line 1087 "SavedSearchDialog.c" +#line 1064 "SavedSearchDialog.c" } -static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { - gboolean result; - result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event); -#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return result; -#line 1096 "SavedSearchDialog.c" +static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self) { +#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self); +#line 1071 "SavedSearchDialog.c" +} + + +static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_on_title_changed ((SavedSearchDialog*) self); +#line 1078 "SavedSearchDialog.c" } static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { - GtkBuilder* _tmp0_; + AppWindow* _tmp0_; AppWindow* _tmp1_; - AppWindow* _tmp2_; - GdkWindow* _tmp3_; - GtkDialog* _tmp4_; - GtkDialog* _tmp5_; - GtkDialog* _tmp6_; - AppWindow* _tmp7_; - AppWindow* _tmp8_; - GtkDialog* _tmp9_; - GtkDialog* _tmp10_; - GtkDialog* _tmp11_; - GtkBox* _tmp12_; - GtkBuilder* _tmp13_; - GObject* _tmp14_; - GtkDialog* _tmp15_; - GtkBuilder* _tmp16_; - GObject* _tmp17_; - GtkButton* _tmp18_; - GtkButton* _tmp19_; - GtkBuilder* _tmp20_; - GObject* _tmp21_; - GtkEntry* _tmp22_; - GtkEntry* _tmp23_; - GtkEntry* _tmp24_; - GtkBuilder* _tmp25_; - GObject* _tmp26_; - GtkBox* _tmp27_; - GtkBuilder* _tmp28_; - GObject* _tmp29_; - GtkComboBoxText* _tmp30_; - GtkComboBoxText* _tmp31_; - GtkComboBoxText* _tmp32_; - GtkComboBoxText* _tmp33_; - GtkComboBoxText* _tmp34_; -#line 688 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + GtkButton* _tmp2_; + GtkEntry* _tmp3_; +#line 696 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = app_window_create_builder ("shotwell.ui", NULL); -#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->builder); -#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->builder = _tmp0_; -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = app_window_get_instance (); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = _tmp1_; -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = (GtkDialog*) gtk_dialog_new_with_buttons (_ ("Search"), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("OK"), GTK_RESPONSE_OK, NULL, NULL); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp4_); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->dialog); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->dialog = _tmp4_; -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp2_); -#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->dialog; -#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), FALSE); -#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->dialog; -#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = app_window_get_instance (); -#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _tmp7_; +#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp0_ = app_window_get_instance (); +#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp1_ = _tmp0_; +#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow)); +#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _g_object_unref0 (_tmp1_); +#line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self, 0); #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow)); + _tmp2_ = self->priv->add_criteria; #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp8_); -#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->dialog; -#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_default_response (_tmp9_, (gint) GTK_RESPONSE_OK); + g_signal_connect_object (_tmp2_, "clicked", (GCallback) _saved_search_dialog_on_add_criteria_gtk_button_clicked, self, 0); #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->dialog; + _tmp3_ = self->priv->search_title; #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp10_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self); -#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->dialog; -#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = (GtkBox*) gtk_dialog_get_content_area (_tmp11_); -#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->builder; -#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = gtk_builder_get_object (_tmp13_, "criteria"); -#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp14_) : NULL); -#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->dialog; -#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_default_response (_tmp15_, (gint) GTK_RESPONSE_OK); -#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->builder; -#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = gtk_builder_get_object (_tmp16_, "Add search button"); -#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL); -#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->add_criteria); -#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->add_criteria = _tmp18_; -#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->add_criteria; -#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self); -#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->builder; -#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = gtk_builder_get_object (_tmp20_, "Search title"); -#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL); -#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->search_title); -#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->search_title = _tmp22_; -#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->search_title; -#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_activates_default (_tmp23_, TRUE); -#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->search_title; -#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self); -#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->builder; -#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = gtk_builder_get_object (_tmp25_, "row_box"); -#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_box_get_type ()) ? ((GtkBox*) _tmp26_) : NULL); -#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->row_box); -#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->row_box = _tmp27_; -#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp28_ = self->priv->builder; -#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = gtk_builder_get_object (_tmp28_, "Type of search criteria"); -#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL); -#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->operator); -#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->operator = _tmp30_; -#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = self->priv->operator; -#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp31_, _ ("any")); -#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = self->priv->operator; -#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp32_, _ ("all")); -#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = self->priv->operator; -#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp33_, _ ("none")); -#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = self->priv->operator; -#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 1264 "SavedSearchDialog.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0); +#line 1107 "SavedSearchDialog.c" } void saved_search_dialog_show (SavedSearchDialog* self) { - GtkDialog* _tmp0_; - GtkDialog* _tmp1_; -#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = self->priv->dialog; -#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_run (_tmp0_); -#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp1_ = self->priv->dialog; -#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 1281 "SavedSearchDialog.c" +#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); +#line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); +#line 1118 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event) { - gboolean result = FALSE; -#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE); -#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_val_if_fail (event != NULL, FALSE); -#line 730 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self) { +#line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); +#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_add_text_search (self); -#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - result = FALSE; -#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return result; -#line 1297 "SavedSearchDialog.c" +#line 1127 "SavedSearchDialog.c" } static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { SavedSearchDialogSearchRowContainer* text = NULL; SavedSearchDialogSearchRowContainer* _tmp0_; -#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = saved_search_dialog_search_row_container_new (); -#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" text = _tmp0_; -#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_add_row (self, text); -#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (text); -#line 1314 "SavedSearchDialog.c" +#line 1144 "SavedSearchDialog.c" } static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) { -#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row); -#line 1321 "SavedSearchDialog.c" +#line 1151 "SavedSearchDialog.c" } static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) { -#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row); -#line 1328 "SavedSearchDialog.c" +#line 1158 "SavedSearchDialog.c" } @@ -1332,7 +1162,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; - GtkBox* _tmp6_; + GtkListBox* _tmp6_; SavedSearchDialogSearchRowContainer* _tmp7_; GtkWidget* _tmp8_; GtkWidget* _tmp9_; @@ -1342,67 +1172,67 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia SavedSearchDialogSearchRowContainer* _tmp13_; SavedSearchDialogSearchRowContainer* _tmp14_; gboolean _tmp15_; -#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row)); -#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->row_list; -#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = _tmp1_; -#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == 1) { -#line 1358 "SavedSearchDialog.c" +#line 1188 "SavedSearchDialog.c" GeeArrayList* _tmp3_; gpointer _tmp4_; SavedSearchDialogSearchRowContainer* _tmp5_; -#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->row_list; -#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = (SavedSearchDialogSearchRowContainer*) _tmp4_; -#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE); -#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp5_); -#line 1372 "SavedSearchDialog.c" +#line 1202 "SavedSearchDialog.c" } -#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = self->priv->row_box; -#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp6_ = self->priv->row_listbox; +#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = row; -#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = saved_search_dialog_search_row_container_get_widget (_tmp7_); -#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = _tmp8_; -#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp9_); -#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp9_); -#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->row_list; -#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = row; -#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = row; -#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self); -#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + g_signal_connect_object (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0); +#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = row; -#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self); -#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + g_signal_connect_object (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0); +#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = row; -#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_); -#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp15_); -#line 1406 "SavedSearchDialog.c" +#line 1236 "SavedSearchDialog.c" } @@ -1411,88 +1241,91 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea guint _tmp1_; SavedSearchDialogSearchRowContainer* _tmp2_; guint _tmp3_; - GtkBox* _tmp4_; + GtkListBox* _tmp4_; SavedSearchDialogSearchRowContainer* _tmp5_; GtkWidget* _tmp6_; GtkWidget* _tmp7_; - GeeArrayList* _tmp8_; - SavedSearchDialogSearchRowContainer* _tmp9_; - GeeArrayList* _tmp10_; - gint _tmp11_; + GtkContainer* _tmp8_; + GeeArrayList* _tmp9_; + SavedSearchDialogSearchRowContainer* _tmp10_; + GeeArrayList* _tmp11_; gint _tmp12_; -#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gint _tmp13_; +#line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row)); -#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = row; -#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE); -#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self); -#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = row; -#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp3_, NULL, FALSE); -#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self); -#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = self->priv->row_box; -#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp4_ = self->priv->row_listbox; +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = row; -#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = saved_search_dialog_search_row_container_get_widget (_tmp5_); -#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), _tmp7_); -#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp8_ = (GtkContainer*) gtk_widget_get_parent (_tmp7_); +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); +#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp7_); -#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->row_list; -#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = row; -#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_); -#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->row_list; -#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _tmp11_; -#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (_tmp12_ == 1) { -#line 1466 "SavedSearchDialog.c" - GeeArrayList* _tmp13_; - gpointer _tmp14_; - SavedSearchDialogSearchRowContainer* _tmp15_; -#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->row_list; -#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); -#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = (SavedSearchDialogSearchRowContainer*) _tmp14_; -#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_allow_removal (_tmp15_, FALSE); -#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _saved_search_dialog_search_row_container_unref0 (_tmp15_); -#line 1480 "SavedSearchDialog.c" +#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp9_ = self->priv->row_list; +#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp10_ = row; +#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); +#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp11_ = self->priv->row_list; +#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp13_ = _tmp12_; +#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + if (_tmp13_ == 1) { +#line 1299 "SavedSearchDialog.c" + GeeArrayList* _tmp14_; + gpointer _tmp15_; + SavedSearchDialogSearchRowContainer* _tmp16_; +#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp14_ = self->priv->row_list; +#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); +#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp16_ = (SavedSearchDialogSearchRowContainer*) _tmp15_; +#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_allow_removal (_tmp16_, FALSE); +#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _saved_search_dialog_search_row_container_unref0 (_tmp16_); +#line 1313 "SavedSearchDialog.c" } -#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); -#line 1484 "SavedSearchDialog.c" +#line 1317 "SavedSearchDialog.c" } static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) { gint _tmp0_; -#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = response_id; -#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 1496 "SavedSearchDialog.c" +#line 1329 "SavedSearchDialog.c" gboolean _tmp1_ = FALSE; SavedSearchTable* _tmp2_; SavedSearchTable* _tmp3_; @@ -1514,111 +1347,111 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo GeeArrayList* _tmp46_; SavedSearch* _tmp47_; SavedSearch* _tmp48_; -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = saved_search_table_get_instance (); -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = _tmp2_; -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->search_title; -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = gtk_entry_get_text (_tmp4_); -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = saved_search_table_exists (_tmp3_, _tmp5_); -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp3_); -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp7_) { -#line 1534 "SavedSearchDialog.c" +#line 1367 "SavedSearchDialog.c" gboolean _tmp8_ = FALSE; gboolean _tmp9_; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->edit_mode; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp9_) { -#line 1541 "SavedSearchDialog.c" +#line 1374 "SavedSearchDialog.c" SavedSearch* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; GtkEntry* _tmp13_; const gchar* _tmp14_; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->previous_search; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _tmp11_; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->search_title; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = gtk_entry_get_text (_tmp13_); -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0; -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp12_); -#line 1561 "SavedSearchDialog.c" +#line 1394 "SavedSearchDialog.c" } else { -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = FALSE; -#line 1565 "SavedSearchDialog.c" +#line 1398 "SavedSearchDialog.c" } -#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = !_tmp8_; -#line 1569 "SavedSearchDialog.c" +#line 1402 "SavedSearchDialog.c" } else { -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1573 "SavedSearchDialog.c" +#line 1406 "SavedSearchDialog.c" } -#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1577 "SavedSearchDialog.c" +#line 1410 "SavedSearchDialog.c" GtkEntry* _tmp15_; const gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; -#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->search_title; -#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = gtk_entry_get_text (_tmp15_); -#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = resources_rename_search_exists_message (_tmp16_); -#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = _tmp17_; -#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" app_window_error_message (_tmp18_, NULL); -#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp18_); -#line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 1596 "SavedSearchDialog.c" +#line 1429 "SavedSearchDialog.c" } -#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = self->priv->edit_mode; -#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp19_) { -#line 1602 "SavedSearchDialog.c" +#line 1435 "SavedSearchDialog.c" SavedSearchTable* _tmp20_; SavedSearchTable* _tmp21_; SavedSearch* _tmp22_; -#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = saved_search_table_get_instance (); -#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = _tmp20_; -#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = self->priv->previous_search; -#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_table_remove (_tmp21_, _tmp22_); -#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp21_); -#line 1616 "SavedSearchDialog.c" +#line 1449 "SavedSearchDialog.c" } -#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL); -#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" conditions = _tmp23_; -#line 1622 "SavedSearchDialog.c" +#line 1455 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; GeeArrayList* _tmp24_; @@ -1628,25 +1461,25 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo gint _tmp27_; gint _tmp28_; gint _c_index = 0; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->row_list; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp25_ = _g_object_ref0 (_tmp24_); -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_list = _tmp25_; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp26_ = _c_list; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp28_ = _tmp27_; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_size = _tmp28_; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_index = -1; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1650 "SavedSearchDialog.c" +#line 1483 "SavedSearchDialog.c" gint _tmp29_; gint _tmp30_; gint _tmp31_; @@ -1658,77 +1491,77 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo SavedSearchDialogSearchRowContainer* _tmp36_; SearchCondition* _tmp37_; SearchCondition* _tmp38_; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp29_ = _c_index; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_index = _tmp29_ + 1; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp30_ = _c_index; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp31_ = _c_size; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!(_tmp30_ < _tmp31_)) { -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1674 "SavedSearchDialog.c" +#line 1507 "SavedSearchDialog.c" } -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp32_ = _c_list; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp33_ = _c_index; -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp34_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp33_); -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = (SavedSearchDialogSearchRowContainer*) _tmp34_; -#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp35_ = conditions; -#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp36_ = c; -#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp37_ = saved_search_dialog_search_row_container_get_search_condition (_tmp36_); -#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp38_ = _tmp37_; -#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); -#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (_tmp38_); -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 1698 "SavedSearchDialog.c" +#line 1531 "SavedSearchDialog.c" } -#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 1702 "SavedSearchDialog.c" +#line 1535 "SavedSearchDialog.c" } -#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp39_ = self->priv->operator; -#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp40_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox)); -#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_operator = (SearchOperator) _tmp40_; -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp41_ = saved_search_table_get_instance (); -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp42_ = _tmp41_; -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp43_ = self->priv->search_title; -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp44_ = gtk_entry_get_text (_tmp43_); -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp45_ = search_operator; -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp46_ = conditions; -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp47_ = saved_search_table_create (_tmp42_, _tmp44_, _tmp45_, _tmp46_); -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp48_ = _tmp47_; -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp48_); -#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp42_); -#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (conditions); -#line 1732 "SavedSearchDialog.c" +#line 1565 "SavedSearchDialog.c" } } @@ -1736,29 +1569,29 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { SavedSearchDialogSearchRowContainer* _tmp0_; gboolean _tmp1_; -#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row)); -#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = row; -#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_); -#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp1_); -#line 1750 "SavedSearchDialog.c" +#line 1583 "SavedSearchDialog.c" } static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) { gboolean _tmp0_; -#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 772 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = saved_search_dialog_is_title_valid (self); -#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp0_); -#line 1762 "SavedSearchDialog.c" +#line 1595 "SavedSearchDialog.c" } @@ -1781,7 +1614,7 @@ static gchar* string_chomp (const gchar* self) { result = _result_; #line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1785 "SavedSearchDialog.c" +#line 1618 "SavedSearchDialog.c" } @@ -1801,147 +1634,146 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { const gchar* _tmp17_; gboolean _tmp18_; gboolean _tmp19_; -#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE); -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->edit_mode; -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_) { -#line 1811 "SavedSearchDialog.c" +#line 1644 "SavedSearchDialog.c" SavedSearch* _tmp3_; -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->previous_search; -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _tmp3_ != NULL; -#line 1817 "SavedSearchDialog.c" +#line 1650 "SavedSearchDialog.c" } else { -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1821 "SavedSearchDialog.c" +#line 1654 "SavedSearchDialog.c" } -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1825 "SavedSearchDialog.c" +#line 1658 "SavedSearchDialog.c" SavedSearch* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; GtkEntry* _tmp7_; const gchar* _tmp8_; -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->previous_search; -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = _tmp5_; -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->search_title; -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = gtk_entry_get_text (_tmp7_); -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0; -#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp6_); -#line 1845 "SavedSearchDialog.c" +#line 1678 "SavedSearchDialog.c" } else { -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = FALSE; -#line 1849 "SavedSearchDialog.c" +#line 1682 "SavedSearchDialog.c" } -#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { -#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1857 "SavedSearchDialog.c" +#line 1690 "SavedSearchDialog.c" } -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->search_title; -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = gtk_entry_get_text (_tmp9_); -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = string_chomp (_tmp10_); -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _tmp11_; -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = g_strcmp0 (_tmp12_, "") == 0; -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp12_); -#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp13_) { -#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = FALSE; -#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1877 "SavedSearchDialog.c" +#line 1710 "SavedSearchDialog.c" } -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = saved_search_table_get_instance (); -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = _tmp14_; -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = self->priv->search_title; -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = gtk_entry_get_text (_tmp16_); -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = saved_search_table_exists (_tmp15_, _tmp17_); -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = _tmp18_; -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp15_); -#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp19_) { -#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = FALSE; -#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1899 "SavedSearchDialog.c" +#line 1732 "SavedSearchDialog.c" } -#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1905 "SavedSearchDialog.c" +#line 1738 "SavedSearchDialog.c" } static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) { gboolean _tmp0_; - GtkDialog* _tmp22_; - gboolean _tmp23_; -#line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gboolean _tmp22_; +#line 788 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); -#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = v; -#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!_tmp0_) { -#line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 1921 "SavedSearchDialog.c" +#line 1753 "SavedSearchDialog.c" } else { gboolean _tmp1_; gboolean _tmp2_; -#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = v; -#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->valid; -#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_ != _tmp2_) { -#line 1931 "SavedSearchDialog.c" +#line 1763 "SavedSearchDialog.c" gboolean _tmp3_; -#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = saved_search_dialog_is_title_valid (self); -#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp3_) { -#line 1937 "SavedSearchDialog.c" +#line 1769 "SavedSearchDialog.c" gint valid_rows = 0; gint _tmp18_; GeeArrayList* _tmp19_; gint _tmp20_; gint _tmp21_; -#line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = 0; -#line 1945 "SavedSearchDialog.c" +#line 1777 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; GeeArrayList* _tmp4_; @@ -1951,25 +1783,25 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) gint _tmp7_; gint _tmp8_; gint _c_index = 0; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->row_list; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_list = _tmp5_; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = _c_list; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = _tmp7_; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_size = _tmp8_; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_index = -1; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1973 "SavedSearchDialog.c" +#line 1805 "SavedSearchDialog.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -1979,96 +1811,94 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) gpointer _tmp14_; SavedSearchDialogSearchRowContainer* _tmp15_; gboolean _tmp16_; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = _c_index; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _c_index = _tmp9_ + 1; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = _c_index; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = _c_size; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!(_tmp10_ < _tmp11_)) { -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1995 "SavedSearchDialog.c" +#line 1827 "SavedSearchDialog.c" } -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _c_list; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = _c_index; -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_); -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = (SavedSearchDialogSearchRowContainer*) _tmp14_; -#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = c; -#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_); -#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp16_) { -#line 2011 "SavedSearchDialog.c" +#line 1843 "SavedSearchDialog.c" gint _tmp17_; -#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = valid_rows; -#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = _tmp17_ + 1; -#line 2017 "SavedSearchDialog.c" +#line 1849 "SavedSearchDialog.c" } -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 2021 "SavedSearchDialog.c" +#line 1853 "SavedSearchDialog.c" } -#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 2025 "SavedSearchDialog.c" +#line 1857 "SavedSearchDialog.c" } -#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = valid_rows; -#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = self->priv->row_list; -#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = _tmp20_; -#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = _tmp18_ == _tmp21_; -#line 2037 "SavedSearchDialog.c" +#line 1869 "SavedSearchDialog.c" } else { -#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 2041 "SavedSearchDialog.c" +#line 1873 "SavedSearchDialog.c" } } } -#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->dialog; -#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->valid; -#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_response_sensitive (_tmp22_, (gint) GTK_RESPONSE_OK, _tmp23_); -#line 2051 "SavedSearchDialog.c" +#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp22_ = self->priv->valid; +#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp22_); +#line 1881 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type) { SavedSearchDialogSearchRowContainer* self = NULL; -#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type); #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_setup_gui (self); + self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_setup_gui (self); +#line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT); -#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 2065 "SavedSearchDialog.c" +#line 1895 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) { -#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 2072 "SavedSearchDialog.c" +#line 1902 "SavedSearchDialog.c" } @@ -2082,60 +1912,58 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta SearchConditionSearchType _tmp5_; SavedSearchDialogSearchRow* _tmp6_; SearchCondition* _tmp7_; -#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL); -#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type); #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_setup_gui (self); + self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type); #line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_setup_gui (self); +#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = search_condition_get_search_type (_tmp0_); -#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = _tmp1_; -#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_set_type (self, _tmp2_); #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_set_type (self, _tmp2_); +#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = sc; -#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = search_condition_get_search_type (_tmp3_); -#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = _tmp4_; -#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_); #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_); +#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->my_row; -#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = sc; -#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_populate (_tmp6_, _tmp7_); -#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 2116 "SavedSearchDialog.c" +#line 1946 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) { -#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc); -#line 2123 "SavedSearchDialog.c" +#line 1953 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self); -#line 2130 "SavedSearchDialog.c" +#line 1960 "SavedSearchDialog.c" } -static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { - gboolean result; - result = saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self, event); -#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return result; -#line 2139 "SavedSearchDialog.c" +static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self) { +#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self); +#line 1967 "SavedSearchDialog.c" } @@ -2147,53 +1975,58 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo GtkComboBoxText* _tmp18_; GtkButton* _tmp19_; GtkButton* _tmp20_; - GtkBox* _tmp21_; + GtkButton* _tmp21_; GtkBox* _tmp22_; - GtkComboBoxText* _tmp23_; - GtkBox* _tmp24_; - GtkButton* _tmp25_; - GtkBox* _tmp26_; -#line 36 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); + GtkBox* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBox* _tmp25_; + GtkButton* _tmp26_; + GtkBox* _tmp27_; + GtkBox* _tmp28_; + GtkBox* _tmp29_; + GtkBox* _tmp30_; + GtkBox* _tmp31_; #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); +#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = search_condition_search_type_as_array (&_tmp0_); -#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->search_types = (g_free (self->priv->search_types), NULL); -#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->search_types = _tmp1_; -#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->search_types_length1 = _tmp0_; -#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->_search_types_size_ = self->priv->search_types_length1; #line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self->priv->_search_types_size_ = self->priv->search_types_length1; +#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = gee_hash_map_new (SEARCH_CONDITION_TYPE_SEARCH_TYPE, NULL, NULL, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->search_types_index); -#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->search_types_index = _tmp2_; #line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self->priv->search_types_index = _tmp2_; +#line 40 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_condition_search_type_sort_array (&self->priv->search_types, &self->priv->search_types_length1); -#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp3_); -#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->type_combo); -#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->type_combo = _tmp3_; -#line 2185 "SavedSearchDialog.c" +#line 2018 "SavedSearchDialog.c" { gint i = 0; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = 0; -#line 2190 "SavedSearchDialog.c" +#line 2023 "SavedSearchDialog.c" { gboolean _tmp4_ = FALSE; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = TRUE; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 2197 "SavedSearchDialog.c" +#line 2030 "SavedSearchDialog.c" gint _tmp6_; SearchConditionSearchType* _tmp7_; gint _tmp7__length1; @@ -2209,121 +2042,141 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo SearchConditionSearchType _tmp15_; gchar* _tmp16_; gchar* _tmp17_; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!_tmp4_) { -#line 2215 "SavedSearchDialog.c" +#line 2048 "SavedSearchDialog.c" gint _tmp5_; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = i; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = _tmp5_ + 1; -#line 2221 "SavedSearchDialog.c" +#line 2054 "SavedSearchDialog.c" } -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = FALSE; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = i; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->search_types; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7__length1 = self->priv->search_types_length1; -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!(_tmp6_ < _tmp7__length1)) { -#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2235 "SavedSearchDialog.c" +#line 2068 "SavedSearchDialog.c" } -#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->search_types; -#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8__length1 = self->priv->search_types_length1; -#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = i; -#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = _tmp8_[_tmp9_]; -#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - st = _tmp10_; #line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + st = _tmp10_; +#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->search_types_index; -#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = st; -#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = i; -#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_)); #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_)); +#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = self->priv->type_combo; -#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = st; -#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = search_condition_search_type_display_text (_tmp15_); -#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = _tmp16_; -#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp14_, _tmp17_); -#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp17_); -#line 2267 "SavedSearchDialog.c" +#line 2100 "SavedSearchDialog.c" } } } -#line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT); #line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT); +#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->type_combo; -#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed, self); -#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON); -#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON); +#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp19_); -#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->remove_button); -#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->remove_button = _tmp19_; #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self->priv->remove_button = _tmp19_; +#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = self->priv->remove_button; -#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event, self); -#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); +#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_button_set_relief (_tmp20_, GTK_RELIEF_NONE); #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp21_); -#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->box); + _tmp21_ = self->priv->remove_button; #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp21_; -#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->box; -#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = self->priv->type_combo; -#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + g_signal_connect (_tmp21_, "clicked", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked, self); #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->box; + _tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->remove_button; + g_object_ref_sink (_tmp22_); #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_end (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + _g_object_unref0 (self->priv->box); +#line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self->priv->box = _tmp22_; #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->box; + _tmp23_ = self->priv->box; #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); -#line 2313 "SavedSearchDialog.c" + _tmp24_ = self->priv->type_combo; +#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_box_pack_start (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp25_ = self->priv->box; +#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp26_ = self->priv->remove_button; +#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_box_pack_end (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); +#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp27_ = self->priv->box; +#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), 2); +#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp28_ = self->priv->box; +#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 2); +#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp29_ = self->priv->box; +#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), 8); +#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp30_ = self->priv->box; +#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), 8); +#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp31_ = self->priv->box; +#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); +#line 2166 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) { SearchConditionSearchType _tmp0_; -#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); -#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = saved_search_dialog_search_row_container_get_search_type (self); -#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_set_type (self, _tmp0_); -#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self); -#line 2327 "SavedSearchDialog.c" +#line 2180 "SavedSearchDialog.c" } @@ -2332,19 +2185,19 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe GeeHashMap* _tmp1_; SearchConditionSearchType _tmp2_; gpointer _tmp3_; -#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); -#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->type_combo; -#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->search_types_index; -#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = st; -#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_)); -#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_)); -#line 2348 "SavedSearchDialog.c" +#line 2201 "SavedSearchDialog.c" } @@ -2355,155 +2208,155 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog SavedSearchDialogSearchRow* _tmp13_; GtkWidget* _tmp14_; GtkWidget* _tmp15_; -#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); -#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->my_row; -#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ != NULL) { -#line 2365 "SavedSearchDialog.c" +#line 2218 "SavedSearchDialog.c" GtkBox* _tmp1_; SavedSearchDialogSearchRow* _tmp2_; GtkWidget* _tmp3_; GtkWidget* _tmp4_; -#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->box; -#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->my_row; -#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = saved_search_dialog_search_row_get_widget (_tmp2_); -#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_); -#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp4_); -#line 2382 "SavedSearchDialog.c" +#line 2235 "SavedSearchDialog.c" } -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = type; -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" switch (_tmp5_) { -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT: -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME: -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME: -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_TAG: -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 2400 "SavedSearchDialog.c" +#line 2253 "SavedSearchDialog.c" { SavedSearchDialogSearchRowText* _tmp6_; -#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = saved_search_dialog_search_row_text_new (self); -#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 86 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2411 "SavedSearchDialog.c" +#line 2264 "SavedSearchDialog.c" } -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 2415 "SavedSearchDialog.c" +#line 2268 "SavedSearchDialog.c" { SavedSearchDialogSearchRowMediaType* _tmp7_; -#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = saved_search_dialog_search_row_media_type_new (self); -#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 90 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2426 "SavedSearchDialog.c" +#line 2279 "SavedSearchDialog.c" } -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 2430 "SavedSearchDialog.c" +#line 2283 "SavedSearchDialog.c" { SavedSearchDialogSearchRowFlagged* _tmp8_; -#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = saved_search_dialog_search_row_flagged_new (self); -#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 94 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2441 "SavedSearchDialog.c" +#line 2294 "SavedSearchDialog.c" } -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 2445 "SavedSearchDialog.c" +#line 2298 "SavedSearchDialog.c" { SavedSearchDialogSearchRowModified* _tmp9_; -#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = saved_search_dialog_search_row_modified_new (self); -#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 98 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2456 "SavedSearchDialog.c" +#line 2309 "SavedSearchDialog.c" } -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 2460 "SavedSearchDialog.c" +#line 2313 "SavedSearchDialog.c" { SavedSearchDialogSearchRowRating* _tmp10_; -#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = saved_search_dialog_search_row_rating_new (self); -#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 102 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2471 "SavedSearchDialog.c" +#line 2324 "SavedSearchDialog.c" } -#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 2475 "SavedSearchDialog.c" +#line 2328 "SavedSearchDialog.c" { SavedSearchDialogSearchRowDate* _tmp11_; -#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = saved_search_dialog_search_row_date_new (self); -#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2486 "SavedSearchDialog.c" +#line 2339 "SavedSearchDialog.c" } default: { -#line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_assert_not_reached (); -#line 2492 "SavedSearchDialog.c" +#line 2345 "SavedSearchDialog.c" } } -#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = self->priv->box; -#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->my_row; -#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = saved_search_dialog_search_row_get_widget (_tmp13_); -#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = _tmp14_; -#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0); -#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp15_); -#line 2507 "SavedSearchDialog.c" +#line 2360 "SavedSearchDialog.c" } @@ -2514,54 +2367,47 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se GtkComboBoxText* _tmp1_; gint _tmp2_; SearchConditionSearchType _tmp3_; -#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0); -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->search_types; -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0__length1 = self->priv->search_types_length1; -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->type_combo; -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = _tmp0_[_tmp2_]; -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp3_; -#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2534 "SavedSearchDialog.c" +#line 2387 "SavedSearchDialog.c" } -static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event) { - gboolean result = FALSE; -#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE); -#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_val_if_fail (event != NULL, FALSE); -#line 114 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self) { +#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); +#line 120 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self); -#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - result = FALSE; -#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return result; -#line 2550 "SavedSearchDialog.c" +#line 2396 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) { GtkButton* _tmp0_; gboolean _tmp1_; -#line 118 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self)); -#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->remove_button; -#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = allow; -#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 2565 "SavedSearchDialog.c" +#line 2411 "SavedSearchDialog.c" } @@ -2569,17 +2415,17 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 122 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL); -#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2583 "SavedSearchDialog.c" +#line 2429 "SavedSearchDialog.c" } @@ -2587,17 +2433,17 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond SearchCondition* result = NULL; SavedSearchDialogSearchRow* _tmp0_; SearchCondition* _tmp1_; -#line 126 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL); -#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->my_row; -#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_get_search_condition (_tmp0_); -#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2601 "SavedSearchDialog.c" +#line 2447 "SavedSearchDialog.c" } @@ -2605,17 +2451,17 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc gboolean result = FALSE; SavedSearchDialogSearchRow* _tmp0_; gboolean _tmp1_; -#line 130 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 135 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE); -#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->my_row; -#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_is_complete (_tmp0_); -#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2619 "SavedSearchDialog.c" +#line 2465 "SavedSearchDialog.c" } @@ -2626,255 +2472,255 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (n_param_values == 2); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data1 = closure->data; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = param_values->data[0].v_pointer; -#line 2638 "SavedSearchDialog.c" +#line 2484 "SavedSearchDialog.c" } else { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data1 = param_values->data[0].v_pointer; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = closure->data; -#line 2644 "SavedSearchDialog.c" +#line 2490 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2); -#line 2650 "SavedSearchDialog.c" +#line 2496 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_container_init (GValue* value) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2657 "SavedSearchDialog.c" +#line 2503 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_container_free_value (GValue* value) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (value->data[0].v_pointer) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (value->data[0].v_pointer); -#line 2666 "SavedSearchDialog.c" +#line 2512 "SavedSearchDialog.c" } } static void saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value, GValue* dest_value) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (src_value->data[0].v_pointer) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer); -#line 2676 "SavedSearchDialog.c" +#line 2522 "SavedSearchDialog.c" } else { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 2680 "SavedSearchDialog.c" +#line 2526 "SavedSearchDialog.c" } } static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2688 "SavedSearchDialog.c" +#line 2534 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 2695 "SavedSearchDialog.c" +#line 2541 "SavedSearchDialog.c" SavedSearchDialogSearchRowContainer * object; object = collect_values[0].v_pointer; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2702 "SavedSearchDialog.c" +#line 2548 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.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 2706 "SavedSearchDialog.c" +#line 2552 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object); -#line 2710 "SavedSearchDialog.c" +#line 2556 "SavedSearchDialog.c" } else { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2714 "SavedSearchDialog.c" +#line 2560 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2718 "SavedSearchDialog.c" +#line 2564 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { SavedSearchDialogSearchRowContainer ** object_p; object_p = collect_values[0].v_pointer; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2729 "SavedSearchDialog.c" +#line 2575 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 2735 "SavedSearchDialog.c" +#line 2581 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 2739 "SavedSearchDialog.c" +#line 2585 "SavedSearchDialog.c" } else { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2743 "SavedSearchDialog.c" +#line 2589 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2747 "SavedSearchDialog.c" +#line 2593 "SavedSearchDialog.c" } static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { SavedSearchDialogParamSpecSearchRowContainer* spec; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 2761 "SavedSearchDialog.c" +#line 2607 "SavedSearchDialog.c" } static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2770 "SavedSearchDialog.c" +#line 2616 "SavedSearchDialog.c" } static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) { SavedSearchDialogSearchRowContainer * old; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" old = value->data[0].v_pointer; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (v_object) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2790 "SavedSearchDialog.c" +#line 2636 "SavedSearchDialog.c" } else { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2794 "SavedSearchDialog.c" +#line 2640 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2800 "SavedSearchDialog.c" +#line 2646 "SavedSearchDialog.c" } } static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) { SavedSearchDialogSearchRowContainer * old; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" old = value->data[0].v_pointer; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (v_object) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER)); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 2819 "SavedSearchDialog.c" +#line 2665 "SavedSearchDialog.c" } else { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2823 "SavedSearchDialog.c" +#line 2669 "SavedSearchDialog.c" } -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2829 "SavedSearchDialog.c" +#line 2675 "SavedSearchDialog.c" } } static void saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_parent_class = g_type_class_peek_parent (klass); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowContainerClass *) klass)->finalize = saved_search_dialog_search_row_container_finalize; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowContainerPrivate)); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 2845 "SavedSearchDialog.c" +#line 2691 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE (self); -#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->my_row = NULL; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 2856 "SavedSearchDialog.c" +#line 2702 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) { SavedSearchDialogSearchRowContainer * self; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_destroy (self); -#line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->type_combo); #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->box); + _g_object_unref0 (self->priv->type_combo); #line 17 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->remove_button); + _g_object_unref0 (self->priv->box); #line 18 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->search_types = (g_free (self->priv->search_types), NULL); + _g_object_unref0 (self->priv->remove_button); #line 19 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + self->priv->search_types = (g_free (self->priv->search_types), NULL); +#line 20 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->search_types_index); -#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 2878 "SavedSearchDialog.c" +#line 2724 "SavedSearchDialog.c" } @@ -2895,322 +2741,322 @@ static GType saved_search_dialog_search_row_container_get_type (void) { static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) { SavedSearchDialogSearchRowContainer * self; self = instance; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 2903 "SavedSearchDialog.c" +#line 2749 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_unref (gpointer instance) { SavedSearchDialogSearchRowContainer * self; self = instance; -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self); -#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2916 "SavedSearchDialog.c" +#line 2762 "SavedSearchDialog.c" } } static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) { -#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2926 "SavedSearchDialog.c" +#line 2772 "SavedSearchDialog.c" } GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) { -#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); -#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self); -#line 2935 "SavedSearchDialog.c" +#line 2781 "SavedSearchDialog.c" } static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) { -#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2944 "SavedSearchDialog.c" +#line 2790 "SavedSearchDialog.c" } SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) { -#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); -#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self); -#line 2953 "SavedSearchDialog.c" +#line 2799 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) { -#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 2962 "SavedSearchDialog.c" +#line 2808 "SavedSearchDialog.c" } void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) { -#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self)); -#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc); -#line 2971 "SavedSearchDialog.c" +#line 2817 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) { gboolean _tmp0_ = FALSE; -#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return _tmp0_; -#line 2981 "SavedSearchDialog.c" +#line 2827 "SavedSearchDialog.c" } gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) { -#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE); -#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self); -#line 2990 "SavedSearchDialog.c" +#line 2836 "SavedSearchDialog.c" } static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type) { SavedSearchDialogSearchRow* self = NULL; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3000 "SavedSearchDialog.c" +#line 2846 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_init (GValue* value) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3007 "SavedSearchDialog.c" +#line 2853 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_free_value (GValue* value) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (value->data[0].v_pointer) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (value->data[0].v_pointer); -#line 3016 "SavedSearchDialog.c" +#line 2862 "SavedSearchDialog.c" } } static void saved_search_dialog_value_search_row_copy_value (const GValue* src_value, GValue* dest_value) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (src_value->data[0].v_pointer) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer); -#line 3026 "SavedSearchDialog.c" +#line 2872 "SavedSearchDialog.c" } else { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 3030 "SavedSearchDialog.c" +#line 2876 "SavedSearchDialog.c" } } static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 3038 "SavedSearchDialog.c" +#line 2884 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (collect_values[0].v_pointer) { -#line 3045 "SavedSearchDialog.c" +#line 2891 "SavedSearchDialog.c" SavedSearchDialogSearchRow * object; object = collect_values[0].v_pointer; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (object->parent_instance.g_class == NULL) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3052 "SavedSearchDialog.c" +#line 2898 "SavedSearchDialog.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.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 3056 "SavedSearchDialog.c" +#line 2902 "SavedSearchDialog.c" } -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_ref (object); -#line 3060 "SavedSearchDialog.c" +#line 2906 "SavedSearchDialog.c" } else { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3064 "SavedSearchDialog.c" +#line 2910 "SavedSearchDialog.c" } -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 3068 "SavedSearchDialog.c" +#line 2914 "SavedSearchDialog.c" } static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { SavedSearchDialogSearchRow ** object_p; object_p = collect_values[0].v_pointer; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3079 "SavedSearchDialog.c" +#line 2925 "SavedSearchDialog.c" } -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 3085 "SavedSearchDialog.c" +#line 2931 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 3089 "SavedSearchDialog.c" +#line 2935 "SavedSearchDialog.c" } else { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 3093 "SavedSearchDialog.c" +#line 2939 "SavedSearchDialog.c" } -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 3097 "SavedSearchDialog.c" +#line 2943 "SavedSearchDialog.c" } static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { SavedSearchDialogParamSpecSearchRow* spec; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 3111 "SavedSearchDialog.c" +#line 2957 "SavedSearchDialog.c" } static gpointer saved_search_dialog_value_get_search_row (const GValue* value) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 3120 "SavedSearchDialog.c" +#line 2966 "SavedSearchDialog.c" } static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) { SavedSearchDialogSearchRow * old; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" old = value->data[0].v_pointer; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (v_object) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 3140 "SavedSearchDialog.c" +#line 2986 "SavedSearchDialog.c" } else { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3144 "SavedSearchDialog.c" +#line 2990 "SavedSearchDialog.c" } -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3150 "SavedSearchDialog.c" +#line 2996 "SavedSearchDialog.c" } } static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) { SavedSearchDialogSearchRow * old; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" old = value->data[0].v_pointer; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (v_object) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW)); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = v_object; -#line 3169 "SavedSearchDialog.c" +#line 3015 "SavedSearchDialog.c" } else { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3173 "SavedSearchDialog.c" +#line 3019 "SavedSearchDialog.c" } -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3179 "SavedSearchDialog.c" +#line 3025 "SavedSearchDialog.c" } } static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_parent_class = g_type_class_peek_parent (klass); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_widget; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_search_condition; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete; -#line 3197 "SavedSearchDialog.c" +#line 3043 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 3204 "SavedSearchDialog.c" +#line 3050 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRow * self; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_destroy (self); -#line 3214 "SavedSearchDialog.c" +#line 3060 "SavedSearchDialog.c" } @@ -3231,46 +3077,46 @@ static GType saved_search_dialog_search_row_get_type (void) { static gpointer saved_search_dialog_search_row_ref (gpointer instance) { SavedSearchDialogSearchRow * self; self = instance; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&self->ref_count); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return instance; -#line 3239 "SavedSearchDialog.c" +#line 3085 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_unref (gpointer instance) { SavedSearchDialogSearchRow * self; self = instance; -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self); -#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3252 "SavedSearchDialog.c" +#line 3098 "SavedSearchDialog.c" } } static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3260 "SavedSearchDialog.c" +#line 3106 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3267 "SavedSearchDialog.c" +#line 3113 "SavedSearchDialog.c" } static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) { -#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? saved_search_dialog_search_row_container_ref (self) : NULL; -#line 3274 "SavedSearchDialog.c" +#line 3120 "SavedSearchDialog.c" } @@ -3298,116 +3144,116 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const GtkBox* _tmp19_; GtkEntry* _tmp20_; GtkBox* _tmp21_; -#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); -#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowText*) saved_search_dialog_search_row_construct (object_type); -#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = parent; -#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); -#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->parent = _tmp1_; -#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp2_); -#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->text_context); -#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->text_context = _tmp2_; -#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->text_context; -#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp3_, _ ("contains")); -#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->text_context; -#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly")); -#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->text_context; -#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp5_, _ ("starts with")); -#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->text_context; -#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp6_, _ ("ends with")); -#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->text_context; -#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain")); -#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->text_context; -#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp8_, _ ("is not set")); -#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->text_context; -#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp9_, _ ("is set")); -#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->text_context; -#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->text_context; -#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self); -#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = (GtkEntry*) gtk_entry_new (); -#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp12_); -#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->entry); -#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->entry = _tmp12_; -#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->entry; -#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_entry_set_width_chars (_tmp13_, 25); -#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = self->priv->entry; -#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_entry_set_activates_default (_tmp14_, TRUE); -#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->entry; -#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); -#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); -#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp16_); -#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->box = _tmp16_; -#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = self->priv->box; -#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->text_context; -#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = self->priv->box; -#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = self->priv->entry; -#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = self->priv->box; -#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget)); -#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3404 "SavedSearchDialog.c" +#line 3250 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) { -#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent); -#line 3411 "SavedSearchDialog.c" +#line 3257 "SavedSearchDialog.c" } @@ -3416,17 +3262,17 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 188 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); -#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3430 "SavedSearchDialog.c" +#line 3276 "SavedSearchDialog.c" } @@ -3444,44 +3290,44 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond SearchConditionTextContext _tmp5_; SearchConditionText* c = NULL; SearchConditionText* _tmp6_; -#line 192 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); -#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" type = _tmp1_; -#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->entry; -#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_entry_get_text (_tmp2_); -#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = g_strdup (_tmp3_); -#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" text = _tmp4_; -#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" context = _tmp5_; -#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_text_new (type, text, context); -#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = _tmp6_; -#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); -#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (text); -#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3478 "SavedSearchDialog.c" +#line 3324 "SavedSearchDialog.c" } static gpointer _search_condition_ref0 (gpointer self) { -#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? search_condition_ref (self) : NULL; -#line 3485 "SavedSearchDialog.c" +#line 3331 "SavedSearchDialog.c" } @@ -3496,39 +3342,39 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog GtkEntry* _tmp5_; const gchar* _tmp6_; const gchar* _tmp7_; -#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); -#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); -#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp0_) : NULL); -#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" text = _tmp1_; -#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (text != NULL, "text != null"); -#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->text_context; -#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = search_condition_text_get_context (text); -#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); -#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->entry; -#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_text_get_text (text); -#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_entry_set_text (_tmp5_, _tmp7_); -#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_on_changed (self); -#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (text); -#line 3532 "SavedSearchDialog.c" +#line 3378 "SavedSearchDialog.c" } @@ -3543,53 +3389,53 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc gchar* _tmp5_; gchar* _tmp6_; gboolean _tmp7_; -#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 213 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->entry; -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_entry_get_text (_tmp2_); -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = string_chomp (_tmp4_); -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = _tmp5_; -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = g_strcmp0 (_tmp6_, "") != 0; -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp6_); -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp7_) { -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = TRUE; -#line 3567 "SavedSearchDialog.c" +#line 3413 "SavedSearchDialog.c" } else { SearchConditionTextContext _tmp8_; -#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; -#line 3574 "SavedSearchDialog.c" +#line 3420 "SavedSearchDialog.c" } -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3580 "SavedSearchDialog.c" +#line 3426 "SavedSearchDialog.c" } else { SearchConditionTextContext _tmp9_; -#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3587 "SavedSearchDialog.c" +#line 3433 "SavedSearchDialog.c" } -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp0_; -#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3593 "SavedSearchDialog.c" +#line 3439 "SavedSearchDialog.c" } @@ -3597,17 +3443,17 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c SearchConditionTextContext result = 0; GtkComboBoxText* _tmp0_; gint _tmp1_; -#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0); -#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->text_context; -#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = (SearchConditionTextContext) _tmp1_; -#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3611 "SavedSearchDialog.c" +#line 3457 "SavedSearchDialog.c" } @@ -3616,73 +3462,73 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea SearchConditionTextContext _tmp1_; SavedSearchDialogSearchRowContainer* _tmp5_; SavedSearchDialogSearchRowContainer* _tmp6_; -#line 218 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self)); -#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) { -#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3628 "SavedSearchDialog.c" +#line 3474 "SavedSearchDialog.c" } else { SearchConditionTextContext _tmp2_; -#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = saved_search_dialog_search_row_text_get_text_context (self); -#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3635 "SavedSearchDialog.c" +#line 3481 "SavedSearchDialog.c" } -#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { -#line 3639 "SavedSearchDialog.c" +#line 3485 "SavedSearchDialog.c" GtkEntry* _tmp3_; -#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->entry; -#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 3645 "SavedSearchDialog.c" +#line 3491 "SavedSearchDialog.c" } else { GtkEntry* _tmp4_; -#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->entry; -#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 3652 "SavedSearchDialog.c" +#line 3498 "SavedSearchDialog.c" } -#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->parent; -#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->parent; -#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_); -#line 3660 "SavedSearchDialog.c" +#line 3506 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) { -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_text_parent_class = g_type_class_peek_parent (klass); -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_text_finalize; -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate)); -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_widget; -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_search_condition; -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate; -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete; -#line 3679 "SavedSearchDialog.c" +#line 3525 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) { -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self); -#line 3686 "SavedSearchDialog.c" +#line 3532 "SavedSearchDialog.c" } @@ -3692,31 +3538,31 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc guint _tmp1_; GtkEntry* _tmp2_; guint _tmp3_; -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText); -#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->text_context; -#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE); -#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self); -#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->entry; -#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE); -#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); -#line 151 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->text_context); -#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->entry); -#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 160 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj); -#line 3720 "SavedSearchDialog.c" +#line 3566 "SavedSearchDialog.c" } @@ -3733,9 +3579,9 @@ static GType saved_search_dialog_search_row_text_get_type (void) { static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self); -#line 3739 "SavedSearchDialog.c" +#line 3585 "SavedSearchDialog.c" } @@ -3760,104 +3606,104 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media GtkBox* _tmp16_; GtkComboBoxText* _tmp17_; GtkBox* _tmp18_; -#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); -#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowMediaType*) saved_search_dialog_search_row_construct (object_type); -#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = parent; -#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); -#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->parent = _tmp1_; -#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp2_); -#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_context); -#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->media_context = _tmp2_; -#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->media_context; -#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp3_, _ ("is")); -#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->media_context; -#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp4_, _ ("is not")); -#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->media_context; -#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->media_context; -#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); -#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp7_); -#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_type); -#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->media_type = _tmp7_; -#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->media_type; -#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp8_, _ ("any photo")); -#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->media_type; -#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo")); -#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->media_type; -#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp10_, _ ("a video")); -#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->media_type; -#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = self->priv->media_type; -#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); -#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); -#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp13_); -#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->box = _tmp13_; -#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = self->priv->box; -#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->media_context; -#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = self->priv->box; -#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = self->priv->media_type; -#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->box; -#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); -#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3854 "SavedSearchDialog.c" +#line 3700 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) { -#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent); -#line 3861 "SavedSearchDialog.c" +#line 3707 "SavedSearchDialog.c" } @@ -3866,17 +3712,17 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 266 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); -#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3880 "SavedSearchDialog.c" +#line 3726 "SavedSearchDialog.c" } @@ -3894,35 +3740,35 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc gint _tmp5_; SearchConditionMediaType* c = NULL; SearchConditionMediaType* _tmp6_; -#line 270 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); -#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_type = _tmp1_; -#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->media_context; -#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); -#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" context = (SearchConditionMediaTypeContext) _tmp3_; -#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->media_type; -#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); -#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" type = (SearchConditionMediaTypeMediaType) _tmp5_; -#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_media_type_new (search_type, context, type); -#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = _tmp6_; -#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); -#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3926 "SavedSearchDialog.c" +#line 3772 "SavedSearchDialog.c" } @@ -3937,91 +3783,91 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch GtkComboBoxText* _tmp5_; SearchConditionMediaTypeMediaType _tmp6_; SearchConditionMediaTypeMediaType _tmp7_; -#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); -#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); -#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp0_) : NULL); -#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" media = _tmp1_; -#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (media != NULL, "media != null"); -#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->media_context; -#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = search_condition_media_type_get_context (media); -#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); -#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->media_type; -#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_media_type_get_media_type (media); -#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_); -#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (media); -#line 3971 "SavedSearchDialog.c" +#line 3817 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowMediaType * self; gboolean result = FALSE; -#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); -#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3984 "SavedSearchDialog.c" +#line 3830 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) { SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; -#line 289 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MEDIA_TYPE (self)); -#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; -#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 3999 "SavedSearchDialog.c" +#line 3845 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) { -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_media_type_parent_class = g_type_class_peek_parent (klass); -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_media_type_finalize; -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate)); -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_widget; -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_search_condition; -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate; -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete; -#line 4018 "SavedSearchDialog.c" +#line 3864 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) { -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self); -#line 4025 "SavedSearchDialog.c" +#line 3871 "SavedSearchDialog.c" } @@ -4031,31 +3877,31 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo guint _tmp1_; GtkComboBoxText* _tmp2_; guint _tmp3_; -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType); -#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->media_context; -#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE); -#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); -#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->media_type; -#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE); -#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); -#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_context); -#line 233 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->media_type); -#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 240 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj); -#line 4059 "SavedSearchDialog.c" +#line 3905 "SavedSearchDialog.c" } @@ -4072,9 +3918,9 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) { static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self); -#line 4078 "SavedSearchDialog.c" +#line 3924 "SavedSearchDialog.c" } @@ -4099,104 +3945,104 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi GtkBox* _tmp16_; GtkComboBoxText* _tmp17_; GtkBox* _tmp18_; -#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); -#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowModified*) saved_search_dialog_search_row_construct (object_type); -#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = parent; -#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); -#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->parent = _tmp1_; -#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp2_); -#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_context); -#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->modified_context = _tmp2_; -#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->modified_context; -#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp3_, _ ("has")); -#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->modified_context; -#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp4_, _ ("has no")); -#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->modified_context; -#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->modified_context; -#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); -#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp7_); -#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_state); -#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->modified_state = _tmp7_; -#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->modified_state; -#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp8_, _ ("modifications")); -#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->modified_state; -#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications")); -#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->modified_state; -#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications")); -#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->modified_state; -#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = self->priv->modified_state; -#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); -#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); -#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp13_); -#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->box = _tmp13_; -#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = self->priv->box; -#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->modified_context; -#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = self->priv->box; -#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = self->priv->modified_state; -#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->box; -#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget)); -#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4193 "SavedSearchDialog.c" +#line 4039 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) { -#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent); -#line 4200 "SavedSearchDialog.c" +#line 4046 "SavedSearchDialog.c" } @@ -4205,17 +4051,17 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 328 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); -#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4219 "SavedSearchDialog.c" +#line 4065 "SavedSearchDialog.c" } @@ -4233,35 +4079,35 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_ gint _tmp5_; SearchConditionModified* c = NULL; SearchConditionModified* _tmp6_; -#line 332 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); -#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_type = _tmp1_; -#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->modified_context; -#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); -#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" context = (SearchConditionModifiedContext) _tmp3_; -#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->modified_state; -#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); -#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" state = (SearchConditionModifiedState) _tmp5_; -#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_modified_new (search_type, context, state); -#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = _tmp6_; -#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); -#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4265 "SavedSearchDialog.c" +#line 4111 "SavedSearchDialog.c" } @@ -4276,91 +4122,91 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi GtkComboBoxText* _tmp5_; SearchConditionModifiedContext _tmp6_; SearchConditionModifiedContext _tmp7_; -#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); -#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); -#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp0_) : NULL); -#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" scm = _tmp1_; -#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (scm != NULL, "scm != null"); -#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->modified_state; -#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = search_condition_modified_get_state (scm); -#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); -#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->modified_context; -#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_modified_get_context (scm); -#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_); -#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (scm); -#line 4310 "SavedSearchDialog.c" +#line 4156 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowModified * self; gboolean result = FALSE; -#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); -#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4323 "SavedSearchDialog.c" +#line 4169 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) { SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; -#line 351 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MODIFIED (self)); -#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; -#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 4338 "SavedSearchDialog.c" +#line 4184 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) { -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_modified_parent_class = g_type_class_peek_parent (klass); -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_modified_finalize; -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate)); -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_widget; -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_search_condition; -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate; -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete; -#line 4357 "SavedSearchDialog.c" +#line 4203 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) { -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self); -#line 4364 "SavedSearchDialog.c" +#line 4210 "SavedSearchDialog.c" } @@ -4370,31 +4216,31 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS guint _tmp1_; GtkComboBoxText* _tmp2_; guint _tmp3_; -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified); -#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->modified_state; -#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE); -#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); -#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->modified_context; -#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE); -#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); -#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_context); -#line 297 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->modified_state); -#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj); -#line 4398 "SavedSearchDialog.c" +#line 4244 "SavedSearchDialog.c" } @@ -4411,9 +4257,9 @@ static GType saved_search_dialog_search_row_modified_get_type (void) { static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self); -#line 4417 "SavedSearchDialog.c" +#line 4263 "SavedSearchDialog.c" } @@ -4433,82 +4279,82 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged GtkBox* _tmp11_; GtkComboBoxText* _tmp12_; GtkBox* _tmp13_; -#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); -#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowFlagged*) saved_search_dialog_search_row_construct (object_type); -#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = parent; -#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); -#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->parent = _tmp1_; -#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp2_); -#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->flagged_state); -#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->flagged_state = _tmp2_; -#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->flagged_state; -#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp3_, _ ("flagged")); -#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->flagged_state; -#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged")); -#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->flagged_state; -#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->flagged_state; -#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); -#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); -#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp7_); -#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->box = _tmp7_; -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->box; -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = (GtkLabel*) gtk_label_new (_ ("is")); -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp9_); -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = _tmp9_; -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp10_); -#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->box; -#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = self->priv->flagged_state; -#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->box; -#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget)); -#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4505 "SavedSearchDialog.c" +#line 4351 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) { -#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent); -#line 4512 "SavedSearchDialog.c" +#line 4358 "SavedSearchDialog.c" } @@ -4517,17 +4363,17 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 382 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); -#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4531 "SavedSearchDialog.c" +#line 4377 "SavedSearchDialog.c" } @@ -4542,29 +4388,29 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c gint _tmp3_; SearchConditionFlagged* c = NULL; SearchConditionFlagged* _tmp4_; -#line 386 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 391 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); -#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_type = _tmp1_; -#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->flagged_state; -#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); -#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" state = (SearchConditionFlaggedState) _tmp3_; -#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = search_condition_flagged_new (search_type, state); -#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = _tmp4_; -#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); -#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4568 "SavedSearchDialog.c" +#line 4414 "SavedSearchDialog.c" } @@ -4576,83 +4422,83 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia GtkComboBoxText* _tmp2_; SearchConditionFlaggedState _tmp3_; SearchConditionFlaggedState _tmp4_; -#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); -#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); -#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp0_) : NULL); -#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" f = _tmp1_; -#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (f != NULL, "f != null"); -#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->flagged_state; -#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = search_condition_flagged_get_state (f); -#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); -#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (f); -#line 4602 "SavedSearchDialog.c" +#line 4448 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowFlagged * self; gboolean result = FALSE; -#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); -#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4615 "SavedSearchDialog.c" +#line 4461 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) { SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; -#line 403 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_FLAGGED (self)); -#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; -#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 4630 "SavedSearchDialog.c" +#line 4476 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) { -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_flagged_parent_class = g_type_class_peek_parent (klass); -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_flagged_finalize; -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate)); -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_widget; -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_search_condition; -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate; -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete; -#line 4649 "SavedSearchDialog.c" +#line 4495 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) { -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self); -#line 4656 "SavedSearchDialog.c" +#line 4502 "SavedSearchDialog.c" } @@ -4660,23 +4506,23 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe SavedSearchDialogSearchRowFlagged * self; GtkComboBoxText* _tmp0_; guint _tmp1_; -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged); -#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->flagged_state; -#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE); -#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); -#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->flagged_state); -#line 360 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 365 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj); -#line 4680 "SavedSearchDialog.c" +#line 4526 "SavedSearchDialog.c" } @@ -4693,9 +4539,9 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) { static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self); -#line 4699 "SavedSearchDialog.c" +#line 4545 "SavedSearchDialog.c" } @@ -4735,150 +4581,150 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c GtkBox* _tmp31_; GtkComboBoxText* _tmp32_; GtkBox* _tmp33_; -#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); -#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowRating*) saved_search_dialog_search_row_construct (object_type); -#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = parent; -#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); -#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->parent = _tmp1_; -#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp2_); -#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->rating); -#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->rating = _tmp2_; -#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->rating; -#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = resources_rating_combo_box (RATING_REJECTED); -#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->rating; -#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = resources_rating_combo_box (RATING_UNRATED); -#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp5_, _tmp6_); -#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->rating; -#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = resources_rating_combo_box (RATING_ONE); -#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp7_, _tmp8_); -#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->rating; -#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = resources_rating_combo_box (RATING_TWO); -#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp9_, _tmp10_); -#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->rating; -#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = resources_rating_combo_box (RATING_THREE); -#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp11_, _tmp12_); -#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->rating; -#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = resources_rating_combo_box (RATING_FOUR); -#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp13_, _tmp14_); -#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->rating; -#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = resources_rating_combo_box (RATING_FIVE); -#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp15_, _tmp16_); -#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = self->priv->rating; -#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->rating; -#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); -#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp19_); -#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->context); -#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->context = _tmp19_; -#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = self->priv->context; -#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp20_, _ ("and higher")); -#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = self->priv->context; -#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp21_, _ ("only")); -#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = self->priv->context; -#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp22_, _ ("and lower")); -#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp23_ = self->priv->context; -#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->context; -#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); -#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); -#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp25_); -#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->box = _tmp25_; -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp26_ = self->priv->box; -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp27_ = (GtkLabel*) gtk_label_new (_ ("is")); -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp27_); -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp28_ = _tmp27_; -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp28_); -#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp29_ = self->priv->box; -#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp30_ = self->priv->rating; -#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp31_ = self->priv->box; -#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp32_ = self->priv->context; -#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp33_ = self->priv->box; -#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget)); -#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 4875 "SavedSearchDialog.c" +#line 4721 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) { -#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent); -#line 4882 "SavedSearchDialog.c" +#line 4728 "SavedSearchDialog.c" } @@ -4887,17 +4733,17 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 449 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); -#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4901 "SavedSearchDialog.c" +#line 4747 "SavedSearchDialog.c" } @@ -4915,35 +4761,35 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co gint _tmp5_; SearchConditionRating* c = NULL; SearchConditionRating* _tmp6_; -#line 453 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); -#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_type = _tmp1_; -#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->rating; -#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); -#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_rating = ((Rating) _tmp3_) + RATING_REJECTED; -#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->context; -#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox)); -#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_context = (SearchConditionRatingContext) _tmp5_; -#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_rating_new (search_type, search_rating, search_context); -#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = _tmp6_; -#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); -#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4947 "SavedSearchDialog.c" +#line 4793 "SavedSearchDialog.c" } @@ -4958,91 +4804,91 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial GtkComboBoxText* _tmp5_; Rating _tmp6_; Rating _tmp7_; -#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); -#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); -#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp0_) : NULL); -#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" r = _tmp1_; -#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (r != NULL, "r != null"); -#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->context; -#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = search_condition_rating_get_context (r); -#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); -#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->rating; -#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = search_condition_rating_get_rating (r); -#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED)); -#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (r); -#line 4992 "SavedSearchDialog.c" +#line 4838 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowRating * self; gboolean result = FALSE; -#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); -#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5005 "SavedSearchDialog.c" +#line 4851 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) { SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; -#line 472 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_RATING (self)); -#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; -#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 5020 "SavedSearchDialog.c" +#line 4866 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) { -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_rating_parent_class = g_type_class_peek_parent (klass); -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_rating_finalize; -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate)); -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_widget; -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_search_condition; -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate; -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete; -#line 5039 "SavedSearchDialog.c" +#line 4885 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) { -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self); -#line 5046 "SavedSearchDialog.c" +#line 4892 "SavedSearchDialog.c" } @@ -5052,31 +4898,31 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea guint _tmp1_; GtkComboBoxText* _tmp2_; guint _tmp3_; -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating); -#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->rating; -#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE); -#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); -#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->context; -#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE); -#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); -#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->rating); -#line 411 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->context); -#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 418 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj); -#line 5080 "SavedSearchDialog.c" +#line 4926 "SavedSearchDialog.c" } @@ -5093,23 +4939,23 @@ static GType saved_search_dialog_search_row_rating_get_type (void) { static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self); -#line 5099 "SavedSearchDialog.c" +#line 4945 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 5106 "SavedSearchDialog.c" +#line 4952 "SavedSearchDialog.c" } static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 5113 "SavedSearchDialog.c" +#line 4959 "SavedSearchDialog.c" } @@ -5142,150 +4988,150 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const GtkBox* _tmp24_; GtkButton* _tmp25_; GtkBox* _tmp26_; -#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL); -#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = (SavedSearchDialogSearchRowDate*) saved_search_dialog_search_row_construct (object_type); -#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = parent; -#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_); -#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->parent = _tmp1_; -#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new (); -#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp2_); -#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->context); -#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->context = _tmp2_; -#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->context; -#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly")); -#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->context; -#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp4_, _ ("is after")); -#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->context; -#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp5_, _ ("is before")); -#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->context; -#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp6_, _ ("is between")); -#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->context; -#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_text_append_text (_tmp7_, _ ("is not set")); -#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->context; -#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->context; -#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); -#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = (GtkCalendar*) gtk_calendar_new (); -#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp10_); -#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_one); -#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->cal_one = _tmp10_; -#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = (GtkCalendar*) gtk_calendar_new (); -#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp11_); -#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_two); -#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->cal_two = _tmp11_; -#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = (GtkButton*) gtk_button_new (); -#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp12_); -#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_one); -#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->label_one = _tmp12_; -#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->label_one; -#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self); -#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = (GtkButton*) gtk_button_new (); -#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp14_); -#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_two); -#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->label_two = _tmp14_; -#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->label_two; -#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self); -#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = (GtkLabel*) gtk_label_new (_ ("and")); -#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp16_); -#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->and); -#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->and = _tmp16_; -#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); -#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp17_); -#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->box = _tmp17_; -#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->box; -#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = self->priv->context; -#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = self->priv->box; -#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = self->priv->label_one; -#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = self->priv->box; -#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp23_ = self->priv->and; -#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->box; -#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp25_ = self->priv->label_two; -#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp26_ = self->priv->box; -#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget)); -#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 5282 "SavedSearchDialog.c" +#line 5128 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) { -#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent); -#line 5289 "SavedSearchDialog.c" +#line 5135 "SavedSearchDialog.c" } @@ -5304,110 +5150,110 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD GDateTime* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; -#line 526 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->context; -#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox)); -#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = (SearchConditionDateContext) _tmp1_; -#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = c; -#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { -#line 5320 "SavedSearchDialog.c" +#line 5166 "SavedSearchDialog.c" GtkButton* _tmp3_; GtkLabel* _tmp4_; GtkButton* _tmp5_; -#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->label_one; -#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->and; -#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->label_two; -#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 5336 "SavedSearchDialog.c" +#line 5182 "SavedSearchDialog.c" } else { SearchConditionDateContext _tmp6_; -#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = c; -#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) { -#line 5343 "SavedSearchDialog.c" +#line 5189 "SavedSearchDialog.c" GtkButton* _tmp7_; GtkLabel* _tmp8_; GtkButton* _tmp9_; -#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->label_one; -#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->and; -#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget)); -#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->label_two; -#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 5359 "SavedSearchDialog.c" +#line 5205 "SavedSearchDialog.c" } else { GtkButton* _tmp10_; GtkLabel* _tmp11_; GtkButton* _tmp12_; -#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->label_one; -#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); -#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = self->priv->and; -#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = self->priv->label_two; -#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 5376 "SavedSearchDialog.c" +#line 5222 "SavedSearchDialog.c" } } -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = self->priv->label_one; -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = saved_search_dialog_search_row_date_get_date_one (self); -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = _tmp14_; -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = g_date_time_format (_tmp15_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT); -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = _tmp16_; -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_button_set_label (_tmp13_, _tmp17_); -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp17_); -#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp15_); -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = self->priv->label_two; -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = saved_search_dialog_search_row_date_get_date_two (self); -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = _tmp19_; -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = g_date_time_format (_tmp20_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT); -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = _tmp21_; -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_button_set_label (_tmp18_, _tmp22_); -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp22_); -#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp20_); -#line 5411 "SavedSearchDialog.c" +#line 5257 "SavedSearchDialog.c" } @@ -5416,17 +5262,17 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 549 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); -#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->box; -#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp1_; -#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5430 "SavedSearchDialog.c" +#line 5276 "SavedSearchDialog.c" } @@ -5442,33 +5288,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD gint _tmp7_; gint _tmp8_; GDateTime* _tmp9_; -#line 553 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL); -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_one; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp0_, "year", &_tmp1_, NULL); -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = _tmp1_; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->cal_one; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp3_, "month", &_tmp4_, NULL); -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = _tmp4_; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->cal_one; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp6_, "day", &_tmp7_, NULL); -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = _tmp7_; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0); -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp9_; -#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5472 "SavedSearchDialog.c" +#line 5318 "SavedSearchDialog.c" } @@ -5484,33 +5330,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD gint _tmp7_; gint _tmp8_; GDateTime* _tmp9_; -#line 557 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL); -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_two; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp0_, "year", &_tmp1_, NULL); -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = _tmp1_; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->cal_two; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp3_, "month", &_tmp4_, NULL); -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = _tmp4_; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->cal_two; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp6_, "day", &_tmp7_, NULL); -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = _tmp7_; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0); -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp9_; -#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5514 "SavedSearchDialog.c" +#line 5360 "SavedSearchDialog.c" } @@ -5524,35 +5370,35 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS GtkCalendar* _tmp6_; GDateTime* _tmp7_; gint _tmp8_; -#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (date != NULL); -#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_one; -#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = date; -#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = g_date_time_get_day_of_month (_tmp1_); -#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp0_, "day", _tmp2_, NULL); -#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->cal_one; -#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = date; -#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = g_date_time_get_month (_tmp4_); -#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL); -#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->cal_one; -#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = date; -#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = g_date_time_get_year (_tmp7_); -#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5556 "SavedSearchDialog.c" +#line 5402 "SavedSearchDialog.c" } @@ -5566,35 +5412,35 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS GtkCalendar* _tmp6_; GDateTime* _tmp7_; gint _tmp8_; -#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (date != NULL); -#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_two; -#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = date; -#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = g_date_time_get_day_of_month (_tmp1_); -#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp0_, "day", _tmp2_, NULL); -#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->cal_two; -#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = date; -#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = g_date_time_get_month (_tmp4_); -#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL); -#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->cal_two; -#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = date; -#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = g_date_time_get_year (_tmp7_); -#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5598 "SavedSearchDialog.c" +#line 5444 "SavedSearchDialog.c" } @@ -5614,43 +5460,43 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond GDateTime* _tmp7_; SearchConditionDate* _tmp8_; SearchConditionDate* _tmp9_; -#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); -#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_); -#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_type = _tmp1_; -#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->context; -#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); -#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" search_context = (SearchConditionDateContext) _tmp3_; -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = saved_search_dialog_search_row_date_get_date_one (self); -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = _tmp4_; -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = saved_search_dialog_search_row_date_get_date_two (self); -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = _tmp6_; -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = search_condition_date_new (search_type, search_context, _tmp5_, _tmp7_); -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = _tmp8_; -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp7_); -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp5_); -#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" c = _tmp9_; -#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); -#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5654 "SavedSearchDialog.c" +#line 5500 "SavedSearchDialog.c" } @@ -5666,136 +5512,136 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog GDateTime* _tmp6_; GDateTime* _tmp7_; GDateTime* _tmp8_; -#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); -#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (IS_SEARCH_CONDITION (sc)); -#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = sc; -#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp0_) : NULL); -#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" cond = _tmp1_; -#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _vala_assert (cond != NULL, "cond != null"); -#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->context; -#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = search_condition_date_get_context (cond); -#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = _tmp3_; -#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_); -#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = search_condition_date_get_date_one (cond); -#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = _tmp5_; -#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_set_date_one (self, _tmp6_); -#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = search_condition_date_get_date_two (cond); -#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = _tmp7_; -#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_set_date_two (self, _tmp8_); -#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (cond); -#line 5706 "SavedSearchDialog.c" +#line 5552 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowDate * self; gboolean result = FALSE; -#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); -#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; -#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5719 "SavedSearchDialog.c" +#line 5565 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) { SavedSearchDialogSearchRowContainer* _tmp0_; SavedSearchDialogSearchRowContainer* _tmp1_; -#line 594 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->parent; -#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; -#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_); -#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5736 "SavedSearchDialog.c" +#line 5582 "SavedSearchDialog.c" } static Block10Data* block10_data_ref (Block10Data* _data10_) { -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_atomic_int_inc (&_data10_->_ref_count_); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return _data10_; -#line 5745 "SavedSearchDialog.c" +#line 5591 "SavedSearchDialog.c" } static void block10_data_unref (void * _userdata_) { Block10Data* _data10_; _data10_ = (Block10Data*) _userdata_; -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { -#line 5754 "SavedSearchDialog.c" +#line 5600 "SavedSearchDialog.c" SavedSearchDialogSearchRowDate* self; -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = _data10_->self; -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_data10_->d); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_slice_free (Block10Data, _data10_); -#line 5764 "SavedSearchDialog.c" +#line 5610 "SavedSearchDialog.c" } } -static void __lambda13_ (SavedSearchDialogSearchRowDate* self) { -#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +static void __lambda14_ (SavedSearchDialogSearchRowDate* self) { +#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5772 "SavedSearchDialog.c" +#line 5618 "SavedSearchDialog.c" } -static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { -#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda13_ ((SavedSearchDialogSearchRowDate*) self); -#line 5779 "SavedSearchDialog.c" +static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { +#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + __lambda14_ ((SavedSearchDialogSearchRowDate*) self); +#line 5625 "SavedSearchDialog.c" } -static void __lambda14_ (Block10Data* _data10_) { +static void __lambda15_ (Block10Data* _data10_) { SavedSearchDialogSearchRowDate* self; GtkDialog* _tmp0_; -#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = _data10_->self; -#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = _data10_->d; -#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT); -#line 5792 "SavedSearchDialog.c" +#line 5638 "SavedSearchDialog.c" } -static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { -#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda14_ (self); -#line 5799 "SavedSearchDialog.c" +static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { +#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + __lambda15_ (self); +#line 5645 "SavedSearchDialog.c" } @@ -5836,192 +5682,192 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo GtkCalendar* _tmp32_; gulong _tmp33_; GtkDialog* _tmp34_; -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (GTK_IS_CALENDAR (cal)); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_ = g_slice_new0 (Block10Data); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_->_ref_count_ = 1; -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_->self = saved_search_dialog_search_row_ref (self); -#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = cal; -#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp0_, "day", &_tmp1_, NULL); -#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = _tmp1_; -#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" orig_day = _tmp2_; -#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = cal; -#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp3_, "month", &_tmp4_, NULL); -#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = _tmp4_; -#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" orig_month = _tmp5_; -#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = cal; -#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_get (_tmp6_, "year", &_tmp7_, NULL); -#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = _tmp7_; -#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" orig_year = _tmp8_; -#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL); -#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp9_); -#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_->d = _tmp9_; -#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = _data10_->d; -#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE); -#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp11_ = _data10_->d; -#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE); -#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _data10_->d; -#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE); -#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp13_ = _data10_->d; -#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_); -#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = cal; -#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget)); -#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp16_ = cal; -#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self); -#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self); +#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_1 = _tmp17_; -#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = cal; -#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda14__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); -#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); +#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_2 = _tmp19_; -#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = _data10_->d; -#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget)); -#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp21_ = _data10_->d; -#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = gtk_dialog_run (_tmp21_); -#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" res = _tmp22_; -#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp23_ = res; -#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) { -#line 5926 "SavedSearchDialog.c" +#line 5772 "SavedSearchDialog.c" GtkCalendar* _tmp24_; gint _tmp25_; GtkCalendar* _tmp26_; gint _tmp27_; GtkCalendar* _tmp28_; gint _tmp29_; -#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = cal; -#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp25_ = orig_day; -#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp24_, "day", _tmp25_, NULL); -#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp26_ = cal; -#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp27_ = orig_month; -#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp26_, "month", _tmp27_, NULL); -#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp28_ = cal; -#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp29_ = orig_year; -#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp28_, "year", _tmp29_, NULL); -#line 5951 "SavedSearchDialog.c" +#line 5797 "SavedSearchDialog.c" } -#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp30_ = cal; -#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp31_ = id_1; -#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, G_TYPE_OBJECT, GObject), _tmp31_); -#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp32_ = cal; -#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp33_ = id_2; -#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_); -#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp34_ = _data10_->d; -#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); -#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" block10_data_unref (_data10_); -#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _data10_ = NULL; -#line 5975 "SavedSearchDialog.c" +#line 5821 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) { GtkCalendar* _tmp0_; -#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_one; -#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 5987 "SavedSearchDialog.c" +#line 5833 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) { GtkCalendar* _tmp0_; -#line 632 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self)); -#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->cal_two; -#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 5999 "SavedSearchDialog.c" +#line 5845 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) { -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_parent_class = g_type_class_peek_parent (klass); -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_date_finalize; -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate)); -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_widget; -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_search_condition; -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate; -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete; -#line 6018 "SavedSearchDialog.c" +#line 5864 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) { -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self); -#line 6025 "SavedSearchDialog.c" +#line 5871 "SavedSearchDialog.c" } @@ -6029,33 +5875,33 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc SavedSearchDialogSearchRowDate * self; GtkComboBoxText* _tmp0_; guint _tmp1_; -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate); -#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = self->priv->context; -#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE); -#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); -#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); -#line 480 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->context); -#line 481 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 486 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_one); -#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->label_two); -#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 488 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_one); -#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->cal_two); -#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->and); -#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 492 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (self->priv->parent); -#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj); -#line 6059 "SavedSearchDialog.c" +#line 5905 "SavedSearchDialog.c" } @@ -6071,288 +5917,82 @@ static GType saved_search_dialog_search_row_date_get_type (void) { } -static void value_saved_search_dialog_init (GValue* value) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = NULL; -#line 6078 "SavedSearchDialog.c" -} - - -static void value_saved_search_dialog_free_value (GValue* value) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (value->data[0].v_pointer) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_unref (value->data[0].v_pointer); -#line 6087 "SavedSearchDialog.c" - } -} - - -static void value_saved_search_dialog_copy_value (const GValue* src_value, GValue* dest_value) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (src_value->data[0].v_pointer) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer); -#line 6097 "SavedSearchDialog.c" - } else { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - dest_value->data[0].v_pointer = NULL; -#line 6101 "SavedSearchDialog.c" - } -} - - -static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return value->data[0].v_pointer; -#line 6109 "SavedSearchDialog.c" -} - - -static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (collect_values[0].v_pointer) { -#line 6116 "SavedSearchDialog.c" - SavedSearchDialog * object; - object = collect_values[0].v_pointer; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (object->parent_instance.g_class == NULL) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6123 "SavedSearchDialog.c" - } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.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 6127 "SavedSearchDialog.c" - } -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = saved_search_dialog_ref (object); -#line 6131 "SavedSearchDialog.c" - } else { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = NULL; -#line 6135 "SavedSearchDialog.c" - } -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return NULL; -#line 6139 "SavedSearchDialog.c" -} - - -static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - SavedSearchDialog ** object_p; - object_p = collect_values[0].v_pointer; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (!object_p) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6150 "SavedSearchDialog.c" - } -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (!value->data[0].v_pointer) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - *object_p = NULL; -#line 6156 "SavedSearchDialog.c" - } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - *object_p = value->data[0].v_pointer; -#line 6160 "SavedSearchDialog.c" - } else { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - *object_p = saved_search_dialog_ref (value->data[0].v_pointer); -#line 6164 "SavedSearchDialog.c" - } -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return NULL; -#line 6168 "SavedSearchDialog.c" -} - - -GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { - ParamSpecSavedSearchDialog* spec; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_DIALOG), NULL); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - G_PARAM_SPEC (spec)->value_type = object_type; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return G_PARAM_SPEC (spec); -#line 6182 "SavedSearchDialog.c" -} - - -gpointer value_get_saved_search_dialog (const GValue* value) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return value->data[0].v_pointer; -#line 6191 "SavedSearchDialog.c" -} - - -void value_set_saved_search_dialog (GValue* value, gpointer v_object) { - SavedSearchDialog * old; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG)); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - old = value->data[0].v_pointer; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (v_object) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_DIALOG)); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = v_object; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_ref (value->data[0].v_pointer); -#line 6211 "SavedSearchDialog.c" - } else { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = NULL; -#line 6215 "SavedSearchDialog.c" - } -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (old) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_unref (old); -#line 6221 "SavedSearchDialog.c" - } -} - - -void value_take_saved_search_dialog (GValue* value, gpointer v_object) { - SavedSearchDialog * old; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG)); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - old = value->data[0].v_pointer; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (v_object) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_DIALOG)); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = v_object; -#line 6240 "SavedSearchDialog.c" - } else { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - value->data[0].v_pointer = NULL; -#line 6244 "SavedSearchDialog.c" - } -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (old) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - saved_search_dialog_unref (old); -#line 6250 "SavedSearchDialog.c" - } -} - - static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gint SavedSearchDialog_private_offset; +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_parent_class = g_type_class_peek_parent (klass); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate)); -#line 6262 "SavedSearchDialog.c" +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + G_OBJECT_CLASS (klass)->finalize = saved_search_dialog_finalize; +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + SavedSearchDialog_private_offset = g_type_class_get_instance_private_offset (klass); +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/saved_search_dialog.ui"); +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "add_criteria", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, add_criteria)); +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "operator", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, operator)); +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "search_title", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, search_title)); +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "row_listbox", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, row_listbox)); +#line 5941 "SavedSearchDialog.c" } static void saved_search_dialog_instance_init (SavedSearchDialog * self) { GeeArrayList* _tmp0_; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self); -#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, (GDestroyNotify) saved_search_dialog_search_row_container_unref, NULL, NULL, NULL); -#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->row_list = _tmp0_; -#line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->edit_mode = FALSE; -#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->previous_search = NULL; -#line 646 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 654 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->ref_count = 1; -#line 6282 "SavedSearchDialog.c" +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + gtk_widget_init_template (GTK_WIDGET (self)); +#line 5961 "SavedSearchDialog.c" } -static void saved_search_dialog_finalize (SavedSearchDialog * obj) { +static void saved_search_dialog_finalize (GObject * obj) { SavedSearchDialog * self; - GtkEntry* _tmp0_; - guint _tmp1_; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handlers_destroy (self); -#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = self->priv->search_title; -#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp1_, NULL, FALSE); -#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self); -#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->builder); -#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->dialog); -#line 639 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->add_criteria); -#line 640 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->operator); -#line 641 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (self->priv->row_box); -#line 642 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 647 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->search_title); -#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + _g_object_unref0 (self->priv->row_listbox); +#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->row_list); -#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" +#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->previous_search); -#line 6316 "SavedSearchDialog.c" +#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" + G_OBJECT_CLASS (saved_search_dialog_parent_class)->finalize (obj); +#line 5983 "SavedSearchDialog.c" } GType saved_search_dialog_get_type (void) { static volatile gsize saved_search_dialog_type_id__volatile = 0; if (g_once_init_enter (&saved_search_dialog_type_id__volatile)) { - static const GTypeValueTable g_define_type_value_table = { value_saved_search_dialog_init, value_saved_search_dialog_free_value, value_saved_search_dialog_copy_value, value_saved_search_dialog_peek_pointer, "p", value_saved_search_dialog_collect_value, "p", value_saved_search_dialog_lcopy_value }; - static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, &g_define_type_value_table }; - static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) }; + static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, NULL }; GType saved_search_dialog_type_id; - saved_search_dialog_type_id = g_type_register_fundamental (g_type_fundamental_next (), "SavedSearchDialog", &g_define_type_info, &g_define_type_fundamental_info, 0); + saved_search_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SavedSearchDialog", &g_define_type_info, 0); g_once_init_leave (&saved_search_dialog_type_id__volatile, saved_search_dialog_type_id); } return saved_search_dialog_type_id__volatile; } -gpointer saved_search_dialog_ref (gpointer instance) { - SavedSearchDialog * self; - self = instance; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_atomic_int_inc (&self->ref_count); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return instance; -#line 6341 "SavedSearchDialog.c" -} - - -void saved_search_dialog_unref (gpointer instance) { - SavedSearchDialog * self; - self = instance; -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self); -#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_type_free_instance ((GTypeInstance *) self); -#line 6354 "SavedSearchDialog.c" - } -} - - |