diff options
Diffstat (limited to 'src/searches/SavedSearchDialog.c')
| -rw-r--r-- | src/searches/SavedSearchDialog.c | 2798 |
1 files changed, 1348 insertions, 1450 deletions
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c index 5050916..86fd417 100644 --- a/src/searches/SavedSearchDialog.c +++ b/src/searches/SavedSearchDialog.c @@ -1,4 +1,4 @@ -/* SavedSearchDialog.c generated by valac 0.34.7, the Vala compiler +/* SavedSearchDialog.c generated by valac 0.36.6, the Vala compiler * generated from SavedSearchDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -191,6 +191,12 @@ typedef struct _SavedSearchDialogSearchRowRatingClass SavedSearchDialogSearchRow typedef struct _SavedSearchDialogSearchRowDate SavedSearchDialogSearchRowDate; typedef struct _SavedSearchDialogSearchRowDateClass SavedSearchDialogSearchRowDateClass; typedef struct _SavedSearchDialogParamSpecSearchRowContainer SavedSearchDialogParamSpecSearchRowContainer; +enum { + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL, + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL, + SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL +}; +static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL] = {0}; typedef struct _SavedSearchDialogSearchRowPrivate SavedSearchDialogSearchRowPrivate; typedef struct _SavedSearchDialogParamSpecSearchRow SavedSearchDialogParamSpecSearchRow; typedef struct _SavedSearchDialogSearchRowTextPrivate SavedSearchDialogSearchRowTextPrivate; @@ -278,7 +284,7 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow typedef struct _SearchConditionDate SearchConditionDate; typedef struct _SearchConditionDateClass SearchConditionDateClass; -typedef struct _Block9Data Block9Data; +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; } @@ -534,7 +540,7 @@ typedef enum { SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET } SearchConditionDateContext; -struct _Block9Data { +struct _Block10Data { int _ref_count_; SavedSearchDialogSearchRowDate* self; GtkDialog* d; @@ -680,7 +686,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) G_GNUC_CONST G_ static SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self); static gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self); static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer* obj); +static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj); enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_DUMMY_PROPERTY }; @@ -689,7 +695,7 @@ static SearchCondition* saved_search_dialog_search_row_real_get_search_condition static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc); static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self); static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type); -static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowTextPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_DUMMY_PROPERTY @@ -708,7 +714,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self); const gchar* search_condition_text_get_text (SearchConditionText* self); static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaTypePrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_DUMMY_PROPERTY @@ -726,7 +732,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self); SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self); static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModifiedPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_DUMMY_PROPERTY @@ -744,7 +750,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self); SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self); static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlaggedPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_DUMMY_PROPERTY @@ -760,7 +766,7 @@ SearchConditionFlagged* search_condition_flagged_construct (GType object_type, S static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc); SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self); static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRatingPrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_DUMMY_PROPERTY @@ -779,7 +785,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self); Rating search_condition_rating_get_rating (SearchConditionRating* self); static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base); -static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow* obj); +static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj); #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDatePrivate)) enum { SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DUMMY_PROPERTY @@ -808,37 +814,37 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self); GDateTime* search_condition_date_get_date_two (SearchConditionDate* self); static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base); static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal); -static Block9Data* block9_data_ref (Block9Data* _data9_); -static void block9_data_unref (void * _userdata_); +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 __lambda12_ (SavedSearchDialogSearchRowDate* self); -static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self); -static void __lambda13_ (Block9Data* _data9_); -static void ___lambda13__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 __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 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 827 "SavedSearchDialog.c" +#line 833 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_construct (GType object_type) { SavedSearchDialog* self = NULL; - GtkEntry* _tmp0_ = NULL; - SavedSearchTable* _tmp1_ = NULL; - SavedSearchTable* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GtkEntry* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp8_ = NULL; - GtkDialog* _tmp9_ = NULL; + GtkEntry* _tmp0_; + SavedSearchTable* _tmp1_; + SavedSearchTable* _tmp2_; + gchar* _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" @@ -883,39 +889,39 @@ SavedSearchDialog* saved_search_dialog_construct (GType object_type) { saved_search_dialog_set_valid (self, FALSE); #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 887 "SavedSearchDialog.c" +#line 893 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_new (void) { #line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG); -#line 894 "SavedSearchDialog.c" +#line 900 "SavedSearchDialog.c" } static gpointer _g_object_ref0 (gpointer self) { #line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? g_object_ref (self) : NULL; -#line 901 "SavedSearchDialog.c" +#line 907 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) { SavedSearchDialog* self = NULL; - SavedSearch* _tmp0_ = NULL; - SavedSearch* _tmp1_ = NULL; - GtkDialog* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - SavedSearch* _tmp4_ = NULL; - SearchOperator _tmp5_ = 0; - GtkEntry* _tmp6_ = NULL; - SavedSearch* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - GeeArrayList* _tmp24_ = NULL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; + SavedSearch* _tmp0_; + SavedSearch* _tmp1_; + GtkDialog* _tmp2_; + GtkComboBoxText* _tmp3_; + SavedSearch* _tmp4_; + SearchOperator _tmp5_; + GtkEntry* _tmp6_; + SavedSearch* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + GeeArrayList* _tmp24_; + gint _tmp25_; + gint _tmp26_; #line 663 "/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" @@ -956,15 +962,15 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ gtk_entry_set_text (_tmp6_, _tmp9_); #line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp9_); -#line 960 "SavedSearchDialog.c" +#line 966 "SavedSearchDialog.c" { GeeList* _sc_list = NULL; - SavedSearch* _tmp10_ = NULL; - GeeList* _tmp11_ = NULL; + SavedSearch* _tmp10_; + GeeList* _tmp11_; gint _sc_size = 0; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeList* _tmp12_; + gint _tmp13_; + gint _tmp14_; gint _sc_index = 0; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = saved_search; @@ -984,17 +990,17 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ _sc_index = -1; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 988 "SavedSearchDialog.c" - gint _tmp15_ = 0; - gint _tmp16_ = 0; - gint _tmp17_ = 0; +#line 994 "SavedSearchDialog.c" + gint _tmp15_; + gint _tmp16_; + gint _tmp17_; SearchCondition* sc = NULL; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gpointer _tmp20_ = NULL; - SearchCondition* _tmp21_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp22_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp23_ = NULL; + GeeList* _tmp18_; + gint _tmp19_; + gpointer _tmp20_; + SearchCondition* _tmp21_; + SavedSearchDialogSearchRowContainer* _tmp22_; + SavedSearchDialogSearchRowContainer* _tmp23_; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = _sc_index; #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1007,7 +1013,7 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ if (!(_tmp16_ < _tmp17_)) { #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1011 "SavedSearchDialog.c" +#line 1017 "SavedSearchDialog.c" } #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = _sc_list; @@ -1029,11 +1035,11 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ _saved_search_dialog_search_row_container_unref0 (_tmp23_); #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (sc); -#line 1033 "SavedSearchDialog.c" +#line 1039 "SavedSearchDialog.c" } #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_sc_list); -#line 1037 "SavedSearchDialog.c" +#line 1043 "SavedSearchDialog.c" } #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->row_list; @@ -1043,10 +1049,10 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ _tmp26_ = _tmp25_; #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp26_ == 1) { -#line 1047 "SavedSearchDialog.c" - GeeArrayList* _tmp27_ = NULL; - gpointer _tmp28_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp29_ = NULL; +#line 1053 "SavedSearchDialog.c" + GeeArrayList* _tmp27_; + gpointer _tmp28_; + SavedSearchDialogSearchRowContainer* _tmp29_; #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp27_ = self->priv->row_list; #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1057,27 +1063,27 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE); #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp29_); -#line 1061 "SavedSearchDialog.c" +#line 1067 "SavedSearchDialog.c" } #line 680 "/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" return self; -#line 1067 "SavedSearchDialog.c" +#line 1073 "SavedSearchDialog.c" } SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) { #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search); -#line 1074 "SavedSearchDialog.c" +#line 1080 "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" saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id); -#line 1081 "SavedSearchDialog.c" +#line 1087 "SavedSearchDialog.c" } @@ -1086,52 +1092,46 @@ static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_eve result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event); #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1090 "SavedSearchDialog.c" +#line 1096 "SavedSearchDialog.c" } static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { - GtkBuilder* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - AppWindow* _tmp2_ = NULL; - AppWindow* _tmp3_ = NULL; - GdkWindow* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkDialog* _tmp7_ = NULL; - GtkDialog* _tmp8_ = NULL; - GtkDialog* _tmp9_ = NULL; - AppWindow* _tmp10_ = NULL; - AppWindow* _tmp11_ = NULL; - GtkDialog* _tmp12_ = NULL; - GtkDialog* _tmp13_ = NULL; - GtkDialog* _tmp14_ = NULL; - GtkBox* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkDialog* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkButton* _tmp21_ = NULL; - GtkButton* _tmp22_ = NULL; - GtkBuilder* _tmp23_ = NULL; - GObject* _tmp24_ = NULL; - GtkEntry* _tmp25_ = NULL; - GtkEntry* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkBox* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkComboBoxText* _tmp33_ = NULL; - GtkComboBoxText* _tmp34_ = NULL; - const gchar* _tmp35_ = NULL; - GtkComboBoxText* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - GtkComboBoxText* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - GtkComboBoxText* _tmp40_ = NULL; + GtkBuilder* _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" g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self)); #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1141,144 +1141,132 @@ static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) { #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_ = _ ("Search"); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp2_ = app_window_get_instance (); -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp3_ = _tmp2_; -#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); + _tmp1_ = app_window_get_instance (); #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = _ ("Cancel"); + _tmp2_ = _tmp1_; #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("OK"); + _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" - _tmp7_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _tmp5_, GTK_RESPONSE_CANCEL, _tmp6_, GTK_RESPONSE_OK, NULL, NULL); + _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 (_tmp7_); + 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 = _tmp7_; + self->priv->dialog = _tmp4_; #line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = self->priv->dialog; + _tmp5_ = self->priv->dialog; #line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), FALSE); + 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" - _tmp9_ = self->priv->dialog; + _tmp6_ = self->priv->dialog; #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = app_window_get_instance (); + _tmp7_ = app_window_get_instance (); #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow)); + 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)); #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->dialog; + _tmp9_ = self->priv->dialog; #line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_default_response (_tmp12_, (gint) GTK_RESPONSE_OK); + gtk_dialog_set_default_response (_tmp9_, (gint) GTK_RESPONSE_OK); #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->dialog; + _tmp10_ = self->priv->dialog; #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp13_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self); + 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" - _tmp14_ = self->priv->dialog; + _tmp11_ = self->priv->dialog; #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = (GtkBox*) gtk_dialog_get_content_area (_tmp14_); + _tmp12_ = (GtkBox*) gtk_dialog_get_content_area (_tmp11_); #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->builder; + _tmp13_ = self->priv->builder; #line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = gtk_builder_get_object (_tmp16_, "criteria"); + _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 (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp17_) : NULL); + 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" - _tmp18_ = self->priv->dialog; + _tmp15_ = self->priv->dialog; #line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_dialog_set_default_response (_tmp18_, (gint) GTK_RESPONSE_OK); + gtk_dialog_set_default_response (_tmp15_, (gint) GTK_RESPONSE_OK); #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->builder; + _tmp16_ = self->priv->builder; #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = gtk_builder_get_object (_tmp19_, "Add search button"); + _tmp17_ = gtk_builder_get_object (_tmp16_, "Add search button"); #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_button_get_type ()) ? ((GtkButton*) _tmp20_) : NULL); + _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 = _tmp21_; + self->priv->add_criteria = _tmp18_; #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->add_criteria; + _tmp19_ = self->priv->add_criteria; #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self); + 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" - _tmp23_ = self->priv->builder; + _tmp20_ = self->priv->builder; #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = gtk_builder_get_object (_tmp23_, "Search title"); + _tmp21_ = gtk_builder_get_object (_tmp20_, "Search title"); #line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL); + _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 = _tmp25_; + self->priv->search_title = _tmp22_; #line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->search_title; + _tmp23_ = self->priv->search_title; #line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_activates_default (_tmp26_, TRUE); + gtk_entry_set_activates_default (_tmp23_, TRUE); #line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->search_title; + _tmp24_ = self->priv->search_title; #line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self); + 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" - _tmp28_ = self->priv->builder; + _tmp25_ = self->priv->builder; #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = gtk_builder_get_object (_tmp28_, "row_box"); + _tmp26_ = gtk_builder_get_object (_tmp25_, "row_box"); #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_box_get_type ()) ? ((GtkBox*) _tmp29_) : NULL); + _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 = _tmp30_; + self->priv->row_box = _tmp27_; #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = self->priv->builder; + _tmp28_ = self->priv->builder; #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = gtk_builder_get_object (_tmp31_, "Type of search criteria"); + _tmp29_ = gtk_builder_get_object (_tmp28_, "Type of search criteria"); #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp32_) : NULL); + _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 = _tmp33_; -#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = self->priv->operator; + self->priv->operator = _tmp30_; #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp35_ = _ ("any"); + _tmp31_ = self->priv->operator; #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp34_, _tmp35_); + gtk_combo_box_text_append_text (_tmp31_, _ ("any")); #line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp36_ = self->priv->operator; + _tmp32_ = self->priv->operator; #line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp37_ = _ ("all"); -#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp36_, _tmp37_); -#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp38_ = self->priv->operator; + gtk_combo_box_text_append_text (_tmp32_, _ ("all")); #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp39_ = _ ("none"); + _tmp33_ = self->priv->operator; #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp38_, _tmp39_); + gtk_combo_box_text_append_text (_tmp33_, _ ("none")); #line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp40_ = self->priv->operator; + _tmp34_ = self->priv->operator; #line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 1276 "SavedSearchDialog.c" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0); +#line 1264 "SavedSearchDialog.c" } void saved_search_dialog_show (SavedSearchDialog* self) { - GtkDialog* _tmp0_ = NULL; - GtkDialog* _tmp1_ = NULL; + GtkDialog* _tmp0_; + GtkDialog* _tmp1_; #line 723 "/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" @@ -1289,7 +1277,7 @@ void saved_search_dialog_show (SavedSearchDialog* self) { _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 1293 "SavedSearchDialog.c" +#line 1281 "SavedSearchDialog.c" } @@ -1305,13 +1293,13 @@ static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, Gd result = FALSE; #line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1309 "SavedSearchDialog.c" +#line 1297 "SavedSearchDialog.c" } static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { SavedSearchDialogSearchRowContainer* text = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; #line 734 "/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" @@ -1322,38 +1310,38 @@ static void saved_search_dialog_add_text_search (SavedSearchDialog* self) { saved_search_dialog_add_row (self, text); #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (text); -#line 1326 "SavedSearchDialog.c" +#line 1314 "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" saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row); -#line 1333 "SavedSearchDialog.c" +#line 1321 "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" saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row); -#line 1340 "SavedSearchDialog.c" +#line 1328 "SavedSearchDialog.c" } static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - GeeArrayList* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkBox* _tmp6_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp7_ = NULL; - GtkWidget* _tmp8_ = NULL; - GtkWidget* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp11_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp12_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp13_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkBox* _tmp6_; + SavedSearchDialogSearchRowContainer* _tmp7_; + GtkWidget* _tmp8_; + GtkWidget* _tmp9_; + GeeArrayList* _tmp10_; + SavedSearchDialogSearchRowContainer* _tmp11_; + SavedSearchDialogSearchRowContainer* _tmp12_; + SavedSearchDialogSearchRowContainer* _tmp13_; + SavedSearchDialogSearchRowContainer* _tmp14_; + gboolean _tmp15_; #line 740 "/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" @@ -1366,10 +1354,10 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia _tmp2_ = _tmp1_; #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == 1) { -#line 1370 "SavedSearchDialog.c" - GeeArrayList* _tmp3_ = NULL; - gpointer _tmp4_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp5_ = NULL; +#line 1358 "SavedSearchDialog.c" + GeeArrayList* _tmp3_; + gpointer _tmp4_; + SavedSearchDialogSearchRowContainer* _tmp5_; #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->row_list; #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1380,7 +1368,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE); #line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (_tmp5_); -#line 1384 "SavedSearchDialog.c" +#line 1372 "SavedSearchDialog.c" } #line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->row_box; @@ -1414,24 +1402,24 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia _tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_); #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp15_); -#line 1418 "SavedSearchDialog.c" +#line 1406 "SavedSearchDialog.c" } static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - guint _tmp1_ = 0U; - SavedSearchDialogSearchRowContainer* _tmp2_ = NULL; - guint _tmp3_ = 0U; - GtkBox* _tmp4_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp5_ = NULL; - GtkWidget* _tmp6_ = NULL; - GtkWidget* _tmp7_ = NULL; - GeeArrayList* _tmp8_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp9_ = NULL; - GeeArrayList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + guint _tmp1_; + SavedSearchDialogSearchRowContainer* _tmp2_; + guint _tmp3_; + GtkBox* _tmp4_; + SavedSearchDialogSearchRowContainer* _tmp5_; + GtkWidget* _tmp6_; + GtkWidget* _tmp7_; + GeeArrayList* _tmp8_; + SavedSearchDialogSearchRowContainer* _tmp9_; + GeeArrayList* _tmp10_; + gint _tmp11_; + gint _tmp12_; #line 751 "/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" @@ -1474,10 +1462,10 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea _tmp12_ = _tmp11_; #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp12_ == 1) { -#line 1478 "SavedSearchDialog.c" - GeeArrayList* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp15_ = NULL; +#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" @@ -1488,44 +1476,44 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea 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 1492 "SavedSearchDialog.c" +#line 1480 "SavedSearchDialog.c" } #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, TRUE); -#line 1496 "SavedSearchDialog.c" +#line 1484 "SavedSearchDialog.c" } static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) { - gint _tmp0_ = 0; + gint _tmp0_; #line 761 "/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" _tmp0_ = response_id; #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 1508 "SavedSearchDialog.c" +#line 1496 "SavedSearchDialog.c" gboolean _tmp1_ = FALSE; - SavedSearchTable* _tmp2_ = NULL; - SavedSearchTable* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gboolean _tmp19_ = FALSE; + SavedSearchTable* _tmp2_; + SavedSearchTable* _tmp3_; + GtkEntry* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + gboolean _tmp19_; GeeArrayList* conditions = NULL; - GeeArrayList* _tmp23_ = NULL; + GeeArrayList* _tmp23_; SearchOperator search_operator = 0; - GtkComboBoxText* _tmp39_ = NULL; - gint _tmp40_ = 0; - SavedSearchTable* _tmp41_ = NULL; - SavedSearchTable* _tmp42_ = NULL; - GtkEntry* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - SearchOperator _tmp45_ = 0; - GeeArrayList* _tmp46_ = NULL; - SavedSearch* _tmp47_ = NULL; - SavedSearch* _tmp48_ = NULL; + GtkComboBoxText* _tmp39_; + gint _tmp40_; + SavedSearchTable* _tmp41_; + SavedSearchTable* _tmp42_; + GtkEntry* _tmp43_; + const gchar* _tmp44_; + SearchOperator _tmp45_; + GeeArrayList* _tmp46_; + SavedSearch* _tmp47_; + SavedSearch* _tmp48_; #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = saved_search_table_get_instance (); #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1542,19 +1530,19 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _saved_search_table_unref0 (_tmp3_); #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp7_) { -#line 1546 "SavedSearchDialog.c" +#line 1534 "SavedSearchDialog.c" gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->edit_mode; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp9_) { -#line 1553 "SavedSearchDialog.c" - SavedSearch* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - GtkEntry* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; +#line 1541 "SavedSearchDialog.c" + SavedSearch* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GtkEntry* _tmp13_; + const gchar* _tmp14_; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->previous_search; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1569,27 +1557,27 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0; #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp12_); -#line 1573 "SavedSearchDialog.c" +#line 1561 "SavedSearchDialog.c" } else { #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = FALSE; -#line 1577 "SavedSearchDialog.c" +#line 1565 "SavedSearchDialog.c" } #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = !_tmp8_; -#line 1581 "SavedSearchDialog.c" +#line 1569 "SavedSearchDialog.c" } else { #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1585 "SavedSearchDialog.c" +#line 1573 "SavedSearchDialog.c" } #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1589 "SavedSearchDialog.c" - GtkEntry* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; +#line 1577 "SavedSearchDialog.c" + GtkEntry* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp15_ = self->priv->search_title; #line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1604,16 +1592,16 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _g_free0 (_tmp18_); #line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return; -#line 1608 "SavedSearchDialog.c" +#line 1596 "SavedSearchDialog.c" } #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp19_ = self->priv->edit_mode; #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp19_) { -#line 1614 "SavedSearchDialog.c" - SavedSearchTable* _tmp20_ = NULL; - SavedSearchTable* _tmp21_ = NULL; - SavedSearch* _tmp22_ = NULL; +#line 1602 "SavedSearchDialog.c" + SavedSearchTable* _tmp20_; + SavedSearchTable* _tmp21_; + SavedSearch* _tmp22_; #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = saved_search_table_get_instance (); #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1624,21 +1612,21 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo saved_search_table_remove (_tmp21_, _tmp22_); #line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_table_unref0 (_tmp21_); -#line 1628 "SavedSearchDialog.c" +#line 1616 "SavedSearchDialog.c" } #line 775 "/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" conditions = _tmp23_; -#line 1634 "SavedSearchDialog.c" +#line 1622 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; - GeeArrayList* _tmp24_ = NULL; - GeeArrayList* _tmp25_ = NULL; + GeeArrayList* _tmp24_; + GeeArrayList* _tmp25_; gint _c_size = 0; - GeeArrayList* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; + GeeArrayList* _tmp26_; + gint _tmp27_; + gint _tmp28_; gint _c_index = 0; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = self->priv->row_list; @@ -1658,18 +1646,18 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _c_index = -1; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1662 "SavedSearchDialog.c" - gint _tmp29_ = 0; - gint _tmp30_ = 0; - gint _tmp31_ = 0; +#line 1650 "SavedSearchDialog.c" + gint _tmp29_; + gint _tmp30_; + gint _tmp31_; SavedSearchDialogSearchRowContainer* c = NULL; - GeeArrayList* _tmp32_ = NULL; - gint _tmp33_ = 0; - gpointer _tmp34_ = NULL; - GeeArrayList* _tmp35_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp36_ = NULL; - SearchCondition* _tmp37_ = NULL; - SearchCondition* _tmp38_ = NULL; + GeeArrayList* _tmp32_; + gint _tmp33_; + gpointer _tmp34_; + GeeArrayList* _tmp35_; + SavedSearchDialogSearchRowContainer* _tmp36_; + SearchCondition* _tmp37_; + SearchCondition* _tmp38_; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp29_ = _c_index; #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1682,7 +1670,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo if (!(_tmp30_ < _tmp31_)) { #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 1686 "SavedSearchDialog.c" +#line 1674 "SavedSearchDialog.c" } #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp32_ = _c_list; @@ -1706,11 +1694,11 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _search_condition_unref0 (_tmp38_); #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 1710 "SavedSearchDialog.c" +#line 1698 "SavedSearchDialog.c" } #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 1714 "SavedSearchDialog.c" +#line 1702 "SavedSearchDialog.c" } #line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp39_ = self->priv->operator; @@ -1740,14 +1728,14 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo _saved_search_table_unref0 (_tmp42_); #line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (conditions); -#line 1744 "SavedSearchDialog.c" +#line 1732 "SavedSearchDialog.c" } } static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SavedSearchDialogSearchRowContainer* _tmp0_; + gboolean _tmp1_; #line 786 "/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" @@ -1758,42 +1746,42 @@ static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSe _tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_); #line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp1_); -#line 1762 "SavedSearchDialog.c" +#line 1750 "SavedSearchDialog.c" } static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 790 "/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" _tmp0_ = saved_search_dialog_is_title_valid (self); #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_set_valid (self, _tmp0_); -#line 1774 "SavedSearchDialog.c" +#line 1762 "SavedSearchDialog.c" } static gchar* string_chomp (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1797 "SavedSearchDialog.c" +#line 1785 "SavedSearchDialog.c" } @@ -1801,44 +1789,44 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - GtkEntry* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - SavedSearchTable* _tmp14_ = NULL; - SavedSearchTable* _tmp15_ = NULL; - GtkEntry* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; + gboolean _tmp2_; + GtkEntry* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gboolean _tmp13_; + SavedSearchTable* _tmp14_; + SavedSearchTable* _tmp15_; + GtkEntry* _tmp16_; + const gchar* _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; #line 794 "/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" _tmp2_ = self->priv->edit_mode; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_) { -#line 1823 "SavedSearchDialog.c" - SavedSearch* _tmp3_ = NULL; +#line 1811 "SavedSearchDialog.c" + SavedSearch* _tmp3_; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->previous_search; #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = _tmp3_ != NULL; -#line 1829 "SavedSearchDialog.c" +#line 1817 "SavedSearchDialog.c" } else { #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = FALSE; -#line 1833 "SavedSearchDialog.c" +#line 1821 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { -#line 1837 "SavedSearchDialog.c" - SavedSearch* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GtkEntry* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; +#line 1825 "SavedSearchDialog.c" + SavedSearch* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GtkEntry* _tmp7_; + const gchar* _tmp8_; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->previous_search; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -1853,11 +1841,11 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { _tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0; #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp6_); -#line 1857 "SavedSearchDialog.c" +#line 1845 "SavedSearchDialog.c" } else { #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = FALSE; -#line 1861 "SavedSearchDialog.c" +#line 1849 "SavedSearchDialog.c" } #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { @@ -1865,7 +1853,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = TRUE; #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1869 "SavedSearchDialog.c" +#line 1857 "SavedSearchDialog.c" } #line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = self->priv->search_title; @@ -1885,7 +1873,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = FALSE; #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1889 "SavedSearchDialog.c" +#line 1877 "SavedSearchDialog.c" } #line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp14_ = saved_search_table_get_instance (); @@ -1907,20 +1895,20 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) { result = FALSE; #line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1911 "SavedSearchDialog.c" +#line 1899 "SavedSearchDialog.c" } #line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = TRUE; #line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 1917 "SavedSearchDialog.c" +#line 1905 "SavedSearchDialog.c" } static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) { - gboolean _tmp0_ = FALSE; - GtkDialog* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + gboolean _tmp0_; + GtkDialog* _tmp22_; + gboolean _tmp23_; #line 806 "/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" @@ -1929,39 +1917,39 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) if (!_tmp0_) { #line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 1933 "SavedSearchDialog.c" +#line 1921 "SavedSearchDialog.c" } else { - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp1_; + gboolean _tmp2_; #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = v; #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp2_ = self->priv->valid; #line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_ != _tmp2_) { -#line 1943 "SavedSearchDialog.c" - gboolean _tmp3_ = FALSE; +#line 1931 "SavedSearchDialog.c" + gboolean _tmp3_; #line 810 "/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" if (_tmp3_) { -#line 1949 "SavedSearchDialog.c" +#line 1937 "SavedSearchDialog.c" gint valid_rows = 0; - gint _tmp18_ = 0; - GeeArrayList* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; + gint _tmp18_; + GeeArrayList* _tmp19_; + gint _tmp20_; + gint _tmp21_; #line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = 0; -#line 1957 "SavedSearchDialog.c" +#line 1945 "SavedSearchDialog.c" { GeeArrayList* _c_list = NULL; - GeeArrayList* _tmp4_ = NULL; - GeeArrayList* _tmp5_ = NULL; + GeeArrayList* _tmp4_; + GeeArrayList* _tmp5_; gint _c_size = 0; - GeeArrayList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeArrayList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _c_index = 0; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->row_list; @@ -1981,16 +1969,16 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _c_index = -1; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 1985 "SavedSearchDialog.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 1973 "SavedSearchDialog.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; SavedSearchDialogSearchRowContainer* c = NULL; - GeeArrayList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeArrayList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + SavedSearchDialogSearchRowContainer* _tmp15_; + gboolean _tmp16_; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp9_ = _c_index; #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2003,7 +1991,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) if (!(_tmp10_ < _tmp11_)) { #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2007 "SavedSearchDialog.c" +#line 1995 "SavedSearchDialog.c" } #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp12_ = _c_list; @@ -2019,21 +2007,21 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_); #line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp16_) { -#line 2023 "SavedSearchDialog.c" - gint _tmp17_ = 0; +#line 2011 "SavedSearchDialog.c" + gint _tmp17_; #line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp17_ = valid_rows; #line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" valid_rows = _tmp17_ + 1; -#line 2029 "SavedSearchDialog.c" +#line 2017 "SavedSearchDialog.c" } #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_container_unref0 (c); -#line 2033 "SavedSearchDialog.c" +#line 2021 "SavedSearchDialog.c" } #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_c_list); -#line 2037 "SavedSearchDialog.c" +#line 2025 "SavedSearchDialog.c" } #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp18_ = valid_rows; @@ -2045,11 +2033,11 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _tmp21_ = _tmp20_; #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = _tmp18_ == _tmp21_; -#line 2049 "SavedSearchDialog.c" +#line 2037 "SavedSearchDialog.c" } else { #line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->valid = FALSE; -#line 2053 "SavedSearchDialog.c" +#line 2041 "SavedSearchDialog.c" } } } @@ -2059,7 +2047,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) _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 2063 "SavedSearchDialog.c" +#line 2051 "SavedSearchDialog.c" } @@ -2073,27 +2061,27 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta 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" return self; -#line 2077 "SavedSearchDialog.c" +#line 2065 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) { #line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER); -#line 2084 "SavedSearchDialog.c" +#line 2072 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc) { SavedSearchDialogSearchRowContainer* self = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; - SearchConditionSearchType _tmp2_ = 0; - SearchCondition* _tmp3_ = NULL; - SearchConditionSearchType _tmp4_ = 0; - SearchConditionSearchType _tmp5_ = 0; - SavedSearchDialogSearchRow* _tmp6_ = NULL; - SearchCondition* _tmp7_ = NULL; + SearchCondition* _tmp0_; + SearchConditionSearchType _tmp1_; + SearchConditionSearchType _tmp2_; + SearchCondition* _tmp3_; + SearchConditionSearchType _tmp4_; + SearchConditionSearchType _tmp5_; + SavedSearchDialogSearchRow* _tmp6_; + SearchCondition* _tmp7_; #line 28 "/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" @@ -2124,21 +2112,21 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta saved_search_dialog_search_row_populate (_tmp6_, _tmp7_); #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 2128 "SavedSearchDialog.c" +#line 2116 "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" return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc); -#line 2135 "SavedSearchDialog.c" +#line 2123 "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" saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self); -#line 2142 "SavedSearchDialog.c" +#line 2130 "SavedSearchDialog.c" } @@ -2147,24 +2135,24 @@ static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_ 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 2151 "SavedSearchDialog.c" +#line 2139 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self) { - gint _tmp0_ = 0; - SearchConditionSearchType* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - GtkComboBoxText* _tmp18_ = NULL; - GtkButton* _tmp19_ = NULL; - GtkButton* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkBox* _tmp22_ = NULL; - GtkComboBoxText* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkButton* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; + gint _tmp0_; + SearchConditionSearchType* _tmp1_; + GeeHashMap* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp18_; + GtkButton* _tmp19_; + GtkButton* _tmp20_; + GtkBox* _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)); #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2193,43 +2181,43 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo _g_object_unref0 (self->priv->type_combo); #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv->type_combo = _tmp3_; -#line 2197 "SavedSearchDialog.c" +#line 2185 "SavedSearchDialog.c" { gint i = 0; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = 0; -#line 2202 "SavedSearchDialog.c" +#line 2190 "SavedSearchDialog.c" { gboolean _tmp4_ = FALSE; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = TRUE; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" while (TRUE) { -#line 2209 "SavedSearchDialog.c" - gint _tmp6_ = 0; - SearchConditionSearchType* _tmp7_ = NULL; - gint _tmp7__length1 = 0; +#line 2197 "SavedSearchDialog.c" + gint _tmp6_; + SearchConditionSearchType* _tmp7_; + gint _tmp7__length1; SearchConditionSearchType st = 0; - SearchConditionSearchType* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - SearchConditionSearchType _tmp10_ = 0; - GeeHashMap* _tmp11_ = NULL; - SearchConditionSearchType _tmp12_ = 0; - gint _tmp13_ = 0; - GtkComboBoxText* _tmp14_ = NULL; - SearchConditionSearchType _tmp15_ = 0; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + SearchConditionSearchType* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + SearchConditionSearchType _tmp10_; + GeeHashMap* _tmp11_; + SearchConditionSearchType _tmp12_; + gint _tmp13_; + GtkComboBoxText* _tmp14_; + SearchConditionSearchType _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!_tmp4_) { -#line 2227 "SavedSearchDialog.c" - gint _tmp5_ = 0; +#line 2215 "SavedSearchDialog.c" + gint _tmp5_; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = i; #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" i = _tmp5_ + 1; -#line 2233 "SavedSearchDialog.c" +#line 2221 "SavedSearchDialog.c" } #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = FALSE; @@ -2243,7 +2231,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo if (!(_tmp6_ < _tmp7__length1)) { #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" break; -#line 2247 "SavedSearchDialog.c" +#line 2235 "SavedSearchDialog.c" } #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp8_ = self->priv->search_types; @@ -2275,7 +2263,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo gtk_combo_box_text_append_text (_tmp14_, _tmp17_); #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_free0 (_tmp17_); -#line 2279 "SavedSearchDialog.c" +#line 2267 "SavedSearchDialog.c" } } } @@ -2321,12 +2309,12 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo _tmp26_ = 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 2325 "SavedSearchDialog.c" +#line 2313 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) { - SearchConditionSearchType _tmp0_ = 0; + SearchConditionSearchType _tmp0_; #line 59 "/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" @@ -2334,16 +2322,16 @@ static void saved_search_dialog_search_row_container_on_type_changed (SavedSearc #line 60 "/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" - g_signal_emit_by_name (self, "changed", self); -#line 2339 "SavedSearchDialog.c" + 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" } static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st) { - GtkComboBoxText* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; - SearchConditionSearchType _tmp2_ = 0; - gpointer _tmp3_ = NULL; + GtkComboBoxText* _tmp0_; + GeeHashMap* _tmp1_; + SearchConditionSearchType _tmp2_; + gpointer _tmp3_; #line 64 "/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" @@ -2356,28 +2344,28 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe _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" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_)); -#line 2360 "SavedSearchDialog.c" +#line 2348 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type) { - SavedSearchDialogSearchRow* _tmp0_ = NULL; - SearchConditionSearchType _tmp5_ = 0; - GtkBox* _tmp12_ = NULL; - SavedSearchDialogSearchRow* _tmp13_ = NULL; - GtkWidget* _tmp14_ = NULL; - GtkWidget* _tmp15_ = NULL; + SavedSearchDialogSearchRow* _tmp0_; + SearchConditionSearchType _tmp5_; + GtkBox* _tmp12_; + SavedSearchDialogSearchRow* _tmp13_; + GtkWidget* _tmp14_; + GtkWidget* _tmp15_; #line 68 "/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" _tmp0_ = self->priv->my_row; #line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_ != NULL) { -#line 2377 "SavedSearchDialog.c" - GtkBox* _tmp1_ = NULL; - SavedSearchDialogSearchRow* _tmp2_ = NULL; - GtkWidget* _tmp3_ = NULL; - GtkWidget* _tmp4_ = NULL; +#line 2365 "SavedSearchDialog.c" + GtkBox* _tmp1_; + SavedSearchDialogSearchRow* _tmp2_; + GtkWidget* _tmp3_; + GtkWidget* _tmp4_; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->box; #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2390,7 +2378,7 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" _g_object_unref0 (_tmp4_); -#line 2394 "SavedSearchDialog.c" +#line 2382 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = type; @@ -2408,9 +2396,9 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog case SEARCH_CONDITION_SEARCH_TYPE_COMMENT: #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_TITLE: -#line 2412 "SavedSearchDialog.c" +#line 2400 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowText* _tmp6_ = NULL; + SavedSearchDialogSearchRowText* _tmp6_; #line 79 "/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" @@ -2419,13 +2407,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" break; -#line 2423 "SavedSearchDialog.c" +#line 2411 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE: -#line 2427 "SavedSearchDialog.c" +#line 2415 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowMediaType* _tmp7_ = NULL; + SavedSearchDialogSearchRowMediaType* _tmp7_; #line 83 "/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" @@ -2434,13 +2422,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" break; -#line 2438 "SavedSearchDialog.c" +#line 2426 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE: -#line 2442 "SavedSearchDialog.c" +#line 2430 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowFlagged* _tmp8_ = NULL; + SavedSearchDialogSearchRowFlagged* _tmp8_; #line 87 "/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" @@ -2449,13 +2437,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" break; -#line 2453 "SavedSearchDialog.c" +#line 2441 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE: -#line 2457 "SavedSearchDialog.c" +#line 2445 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowModified* _tmp9_ = NULL; + SavedSearchDialogSearchRowModified* _tmp9_; #line 91 "/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" @@ -2464,13 +2452,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" break; -#line 2468 "SavedSearchDialog.c" +#line 2456 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_RATING: -#line 2472 "SavedSearchDialog.c" +#line 2460 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowRating* _tmp10_ = NULL; + SavedSearchDialogSearchRowRating* _tmp10_; #line 95 "/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" @@ -2479,13 +2467,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" break; -#line 2483 "SavedSearchDialog.c" +#line 2471 "SavedSearchDialog.c" } #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" case SEARCH_CONDITION_SEARCH_TYPE_DATE: -#line 2487 "SavedSearchDialog.c" +#line 2475 "SavedSearchDialog.c" { - SavedSearchDialogSearchRowDate* _tmp11_ = NULL; + SavedSearchDialogSearchRowDate* _tmp11_; #line 99 "/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" @@ -2494,13 +2482,13 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog 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" break; -#line 2498 "SavedSearchDialog.c" +#line 2486 "SavedSearchDialog.c" } default: { #line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_assert_not_reached (); -#line 2504 "SavedSearchDialog.c" +#line 2492 "SavedSearchDialog.c" } } #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -2515,17 +2503,17 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0); #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (_tmp15_); -#line 2519 "SavedSearchDialog.c" +#line 2507 "SavedSearchDialog.c" } static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self) { SearchConditionSearchType result = 0; - SearchConditionSearchType* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; - SearchConditionSearchType _tmp3_ = 0; + SearchConditionSearchType* _tmp0_; + gint _tmp0__length1; + GtkComboBoxText* _tmp1_; + gint _tmp2_; + SearchConditionSearchType _tmp3_; #line 109 "/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" @@ -2542,7 +2530,7 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se result = _tmp3_; #line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2546 "SavedSearchDialog.c" +#line 2534 "SavedSearchDialog.c" } @@ -2553,18 +2541,18 @@ static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearch #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" - g_signal_emit_by_name (self, "remove", self); + 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 2562 "SavedSearchDialog.c" +#line 2550 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) { - GtkButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GtkButton* _tmp0_; + gboolean _tmp1_; #line 118 "/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" @@ -2573,14 +2561,14 @@ static void saved_search_dialog_search_row_container_allow_removal (SavedSearchD _tmp1_ = allow; #line 119 "/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 2577 "SavedSearchDialog.c" +#line 2565 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self) { GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 122 "/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" @@ -2591,14 +2579,14 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear result = _tmp1_; #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2595 "SavedSearchDialog.c" +#line 2583 "SavedSearchDialog.c" } static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self) { SearchCondition* result = NULL; - SavedSearchDialogSearchRow* _tmp0_ = NULL; - SearchCondition* _tmp1_ = NULL; + SavedSearchDialogSearchRow* _tmp0_; + SearchCondition* _tmp1_; #line 126 "/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" @@ -2609,14 +2597,14 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond result = _tmp1_; #line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2613 "SavedSearchDialog.c" +#line 2601 "SavedSearchDialog.c" } static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self) { gboolean result = FALSE; - SavedSearchDialogSearchRow* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SavedSearchDialogSearchRow* _tmp0_; + gboolean _tmp1_; #line 130 "/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" @@ -2627,7 +2615,7 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc result = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 2631 "SavedSearchDialog.c" +#line 2619 "SavedSearchDialog.c" } @@ -2646,26 +2634,26 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN data1 = closure->data; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" data2 = param_values->data[0].v_pointer; -#line 2650 "SavedSearchDialog.c" +#line 2638 "SavedSearchDialog.c" } else { #line 11 "/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" data2 = closure->data; -#line 2656 "SavedSearchDialog.c" +#line 2644 "SavedSearchDialog.c" } #line 11 "/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" callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2); -#line 2662 "SavedSearchDialog.c" +#line 2650 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_container_init (GValue* value) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2669 "SavedSearchDialog.c" +#line 2657 "SavedSearchDialog.c" } @@ -2674,7 +2662,7 @@ static void saved_search_dialog_value_search_row_container_free_value (GValue* v if (value->data[0].v_pointer) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (value->data[0].v_pointer); -#line 2678 "SavedSearchDialog.c" +#line 2666 "SavedSearchDialog.c" } } @@ -2684,11 +2672,11 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa if (src_value->data[0].v_pointer) { #line 11 "/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 2688 "SavedSearchDialog.c" +#line 2676 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 2692 "SavedSearchDialog.c" +#line 2680 "SavedSearchDialog.c" } } @@ -2696,66 +2684,66 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 2700 "SavedSearchDialog.c" +#line 2688 "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" if (collect_values[0].v_pointer) { -#line 2707 "SavedSearchDialog.c" - SavedSearchDialogSearchRowContainer* object; +#line 2695 "SavedSearchDialog.c" + SavedSearchDialogSearchRowContainer * object; object = collect_values[0].v_pointer; #line 11 "/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" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2714 "SavedSearchDialog.c" +#line 2702 "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" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2718 "SavedSearchDialog.c" +#line 2706 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object); -#line 2722 "SavedSearchDialog.c" +#line 2710 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2726 "SavedSearchDialog.c" +#line 2714 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2730 "SavedSearchDialog.c" +#line 2718 "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; + SavedSearchDialogSearchRowContainer ** object_p; object_p = collect_values[0].v_pointer; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 11 "/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 2741 "SavedSearchDialog.c" +#line 2729 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 2747 "SavedSearchDialog.c" +#line 2735 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 2751 "SavedSearchDialog.c" +#line 2739 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2755 "SavedSearchDialog.c" +#line 2743 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 2759 "SavedSearchDialog.c" +#line 2747 "SavedSearchDialog.c" } @@ -2769,7 +2757,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 2773 "SavedSearchDialog.c" +#line 2761 "SavedSearchDialog.c" } @@ -2778,12 +2766,12 @@ static gpointer saved_search_dialog_value_get_search_row_container (const GValue 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" return value->data[0].v_pointer; -#line 2782 "SavedSearchDialog.c" +#line 2770 "SavedSearchDialog.c" } static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRowContainer* old; + SavedSearchDialogSearchRowContainer * old; #line 11 "/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" @@ -2798,23 +2786,23 @@ static void saved_search_dialog_value_set_search_row_container (GValue* value, g value->data[0].v_pointer = v_object; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_ref (value->data[0].v_pointer); -#line 2802 "SavedSearchDialog.c" +#line 2790 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2806 "SavedSearchDialog.c" +#line 2794 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2812 "SavedSearchDialog.c" +#line 2800 "SavedSearchDialog.c" } } static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRowContainer* old; + SavedSearchDialogSearchRowContainer * old; #line 11 "/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" @@ -2827,17 +2815,17 @@ static void saved_search_dialog_value_take_search_row_container (GValue* value, 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" value->data[0].v_pointer = v_object; -#line 2831 "SavedSearchDialog.c" +#line 2819 "SavedSearchDialog.c" } else { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 2835 "SavedSearchDialog.c" +#line 2823 "SavedSearchDialog.c" } #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_container_unref (old); -#line 2841 "SavedSearchDialog.c" +#line 2829 "SavedSearchDialog.c" } } @@ -2850,10 +2838,10 @@ static void saved_search_dialog_search_row_container_class_init (SavedSearchDial #line 11 "/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" - 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); + 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" - 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 2857 "SavedSearchDialog.c" + 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" } @@ -2864,11 +2852,11 @@ static void saved_search_dialog_search_row_container_instance_init (SavedSearchD self->priv->my_row = NULL; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 2868 "SavedSearchDialog.c" +#line 2856 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer* obj) { +static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) { SavedSearchDialogSearchRowContainer * self; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer); @@ -2886,7 +2874,7 @@ static void saved_search_dialog_search_row_container_finalize (SavedSearchDialog _g_object_unref0 (self->priv->search_types_index); #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _saved_search_dialog_search_row_unref0 (self->priv->my_row); -#line 2890 "SavedSearchDialog.c" +#line 2878 "SavedSearchDialog.c" } @@ -2905,18 +2893,18 @@ static GType saved_search_dialog_search_row_container_get_type (void) { static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) { - SavedSearchDialogSearchRowContainer* self; + SavedSearchDialogSearchRowContainer * self; self = instance; #line 11 "/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" return instance; -#line 2915 "SavedSearchDialog.c" +#line 2903 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_container_unref (gpointer instance) { - SavedSearchDialogSearchRowContainer* self; + SavedSearchDialogSearchRowContainer * self; self = instance; #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2924,7 +2912,7 @@ static void saved_search_dialog_search_row_container_unref (gpointer instance) { SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self); #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2928 "SavedSearchDialog.c" +#line 2916 "SavedSearchDialog.c" } } @@ -2934,7 +2922,7 @@ static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDia 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" return NULL; -#line 2938 "SavedSearchDialog.c" +#line 2926 "SavedSearchDialog.c" } @@ -2943,7 +2931,7 @@ GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); #line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self); -#line 2947 "SavedSearchDialog.c" +#line 2935 "SavedSearchDialog.c" } @@ -2952,7 +2940,7 @@ static SearchCondition* saved_search_dialog_search_row_real_get_search_condition 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" return NULL; -#line 2956 "SavedSearchDialog.c" +#line 2944 "SavedSearchDialog.c" } @@ -2961,7 +2949,7 @@ SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearc g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL); #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self); -#line 2965 "SavedSearchDialog.c" +#line 2953 "SavedSearchDialog.c" } @@ -2970,7 +2958,7 @@ static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearc 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" return; -#line 2974 "SavedSearchDialog.c" +#line 2962 "SavedSearchDialog.c" } @@ -2979,7 +2967,7 @@ void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self)); #line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc); -#line 2983 "SavedSearchDialog.c" +#line 2971 "SavedSearchDialog.c" } @@ -2989,7 +2977,7 @@ static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDial 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" return _tmp0_; -#line 2993 "SavedSearchDialog.c" +#line 2981 "SavedSearchDialog.c" } @@ -2998,7 +2986,7 @@ gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE); #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self); -#line 3002 "SavedSearchDialog.c" +#line 2990 "SavedSearchDialog.c" } @@ -3008,14 +2996,14 @@ static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GTy self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 3012 "SavedSearchDialog.c" +#line 3000 "SavedSearchDialog.c" } static void saved_search_dialog_value_search_row_init (GValue* value) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3019 "SavedSearchDialog.c" +#line 3007 "SavedSearchDialog.c" } @@ -3024,7 +3012,7 @@ static void saved_search_dialog_value_search_row_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (value->data[0].v_pointer); -#line 3028 "SavedSearchDialog.c" +#line 3016 "SavedSearchDialog.c" } } @@ -3034,11 +3022,11 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v if (src_value->data[0].v_pointer) { #line 136 "/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 3038 "SavedSearchDialog.c" +#line 3026 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 3042 "SavedSearchDialog.c" +#line 3030 "SavedSearchDialog.c" } } @@ -3046,66 +3034,66 @@ static void saved_search_dialog_value_search_row_copy_value (const GValue* src_v static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return value->data[0].v_pointer; -#line 3050 "SavedSearchDialog.c" +#line 3038 "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" if (collect_values[0].v_pointer) { -#line 3057 "SavedSearchDialog.c" - SavedSearchDialogSearchRow* object; +#line 3045 "SavedSearchDialog.c" + SavedSearchDialogSearchRow * object; object = collect_values[0].v_pointer; #line 136 "/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" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3064 "SavedSearchDialog.c" +#line 3052 "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" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3068 "SavedSearchDialog.c" +#line 3056 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = saved_search_dialog_search_row_ref (object); -#line 3072 "SavedSearchDialog.c" +#line 3060 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3076 "SavedSearchDialog.c" +#line 3064 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 3080 "SavedSearchDialog.c" +#line 3068 "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; + SavedSearchDialogSearchRow ** object_p; object_p = collect_values[0].v_pointer; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!object_p) { #line 136 "/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 3091 "SavedSearchDialog.c" +#line 3079 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (!value->data[0].v_pointer) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = NULL; -#line 3097 "SavedSearchDialog.c" +#line 3085 "SavedSearchDialog.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = value->data[0].v_pointer; -#line 3101 "SavedSearchDialog.c" +#line 3089 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" *object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 3105 "SavedSearchDialog.c" +#line 3093 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 3109 "SavedSearchDialog.c" +#line 3097 "SavedSearchDialog.c" } @@ -3119,7 +3107,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, G_PARAM_SPEC (spec)->value_type = object_type; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 3123 "SavedSearchDialog.c" +#line 3111 "SavedSearchDialog.c" } @@ -3128,12 +3116,12 @@ static gpointer saved_search_dialog_value_get_search_row (const GValue* value) { 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" return value->data[0].v_pointer; -#line 3132 "SavedSearchDialog.c" +#line 3120 "SavedSearchDialog.c" } static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRow* old; + SavedSearchDialogSearchRow * old; #line 136 "/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" @@ -3148,23 +3136,23 @@ static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_ value->data[0].v_pointer = v_object; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_ref (value->data[0].v_pointer); -#line 3152 "SavedSearchDialog.c" +#line 3140 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3156 "SavedSearchDialog.c" +#line 3144 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3162 "SavedSearchDialog.c" +#line 3150 "SavedSearchDialog.c" } } static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) { - SavedSearchDialogSearchRow* old; + SavedSearchDialogSearchRow * old; #line 136 "/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" @@ -3177,17 +3165,17 @@ static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v 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" value->data[0].v_pointer = v_object; -#line 3181 "SavedSearchDialog.c" +#line 3169 "SavedSearchDialog.c" } else { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 3185 "SavedSearchDialog.c" +#line 3173 "SavedSearchDialog.c" } #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (old) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_unref (old); -#line 3191 "SavedSearchDialog.c" +#line 3179 "SavedSearchDialog.c" } } @@ -3198,31 +3186,31 @@ static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRo #line 136 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_widget; + ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_widget; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_is_complete; -#line 3209 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete; +#line 3197 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) { #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 3216 "SavedSearchDialog.c" +#line 3204 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRow * self; #line 136 "/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" g_signal_handlers_destroy (self); -#line 3226 "SavedSearchDialog.c" +#line 3214 "SavedSearchDialog.c" } @@ -3241,18 +3229,18 @@ static GType saved_search_dialog_search_row_get_type (void) { static gpointer saved_search_dialog_search_row_ref (gpointer instance) { - SavedSearchDialogSearchRow* self; + SavedSearchDialogSearchRow * self; self = instance; #line 136 "/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" return instance; -#line 3251 "SavedSearchDialog.c" +#line 3239 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_unref (gpointer instance) { - SavedSearchDialogSearchRow* self; + SavedSearchDialogSearchRow * self; self = instance; #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3260,7 +3248,7 @@ static void saved_search_dialog_search_row_unref (gpointer instance) { SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self); #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3264 "SavedSearchDialog.c" +#line 3252 "SavedSearchDialog.c" } } @@ -3268,55 +3256,48 @@ static void saved_search_dialog_search_row_unref (gpointer instance) { 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" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3272 "SavedSearchDialog.c" +#line 3260 "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" saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self); -#line 3279 "SavedSearchDialog.c" +#line 3267 "SavedSearchDialog.c" } static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) { #line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? saved_search_dialog_search_row_container_ref (self) : NULL; -#line 3286 "SavedSearchDialog.c" +#line 3274 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowText* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkComboBoxText* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkComboBoxText* _tmp18_ = NULL; - GtkEntry* _tmp19_ = NULL; - GtkEntry* _tmp20_ = NULL; - GtkEntry* _tmp21_ = NULL; - GtkEntry* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkComboBoxText* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkEntry* _tmp12_; + GtkEntry* _tmp13_; + GtkEntry* _tmp14_; + GtkEntry* _tmp15_; + GtkBox* _tmp16_; + GtkBox* _tmp17_; + GtkComboBoxText* _tmp18_; + GtkBox* _tmp19_; + GtkEntry* _tmp20_; + GtkBox* _tmp21_; #line 157 "/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" @@ -3340,115 +3321,101 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->text_context; #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("contains"); -#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); + gtk_combo_box_text_append_text (_tmp3_, _ ("contains")); #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->text_context; -#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("is exactly"); + _tmp4_ = self->priv->text_context; #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly")); #line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->text_context; -#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _ ("starts with"); + _tmp5_ = self->priv->text_context; #line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _tmp8_); + gtk_combo_box_text_append_text (_tmp5_, _ ("starts with")); #line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->text_context; -#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _ ("ends with"); + _tmp6_ = self->priv->text_context; #line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _tmp10_); + gtk_combo_box_text_append_text (_tmp6_, _ ("ends with")); #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->text_context; -#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _ ("does not contain"); + _tmp7_ = self->priv->text_context; #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp11_, _tmp12_); -#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->text_context; + gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain")); #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = _ ("is not set"); + _tmp8_ = self->priv->text_context; #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp13_, _tmp14_); + gtk_combo_box_text_append_text (_tmp8_, _ ("is not set")); #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->text_context; -#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = _ ("is set"); + _tmp9_ = self->priv->text_context; #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp15_, _tmp16_); + gtk_combo_box_text_append_text (_tmp9_, _ ("is set")); #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = self->priv->text_context; + _tmp10_ = self->priv->text_context; #line 169 "/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); + 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" - _tmp18_ = self->priv->text_context; + _tmp11_ = self->priv->text_context; #line 170 "/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_text_on_changed_gtk_combo_box_changed, self); + 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" - _tmp19_ = (GtkEntry*) gtk_entry_new (); + _tmp12_ = (GtkEntry*) gtk_entry_new (); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp12_); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->entry); #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->entry = _tmp19_; + self->priv->entry = _tmp12_; #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->entry; + _tmp13_ = self->priv->entry; #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_width_chars (_tmp20_, 25); + gtk_entry_set_width_chars (_tmp13_, 25); #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = self->priv->entry; + _tmp14_ = self->priv->entry; #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_entry_set_activates_default (_tmp21_, TRUE); + gtk_entry_set_activates_default (_tmp14_, TRUE); #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->entry; + _tmp15_ = self->priv->entry; #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self); + 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" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp16_); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp23_; + self->priv->box = _tmp16_; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->box; + _tmp17_ = self->priv->box; #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->text_context; + _tmp18_ = self->priv->text_context; #line 178 "/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); + 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" - _tmp26_ = self->priv->box; + _tmp19_ = self->priv->box; #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->entry; + _tmp20_ = self->priv->entry; #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp28_ = self->priv->box; + _tmp21_ = self->priv->box; #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget)); + 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" return self; -#line 3437 "SavedSearchDialog.c" +#line 3404 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) { #line 157 "/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 3444 "SavedSearchDialog.c" +#line 3411 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowText * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 188 "/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" @@ -3459,7 +3426,7 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear result = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3463 "SavedSearchDialog.c" +#line 3430 "SavedSearchDialog.c" } @@ -3467,16 +3434,16 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond SavedSearchDialogSearchRowText * self; SearchCondition* result = NULL; SearchConditionSearchType type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; gchar* text = NULL; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; SearchConditionTextContext context = 0; - SearchConditionTextContext _tmp5_ = 0; + SearchConditionTextContext _tmp5_; SearchConditionText* c = NULL; - SearchConditionText* _tmp6_ = NULL; + SearchConditionText* _tmp6_; #line 192 "/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" @@ -3507,28 +3474,28 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond _g_free0 (text); #line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3511 "SavedSearchDialog.c" +#line 3478 "SavedSearchDialog.c" } static gpointer _search_condition_ref0 (gpointer self) { #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self ? search_condition_ref (self) : NULL; -#line 3518 "SavedSearchDialog.c" +#line 3485 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowText * self; SearchConditionText* text = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionText* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionTextContext _tmp3_ = 0; - SearchConditionTextContext _tmp4_ = 0; - GtkEntry* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + SearchCondition* _tmp0_; + SearchConditionText* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionTextContext _tmp3_; + SearchConditionTextContext _tmp4_; + GtkEntry* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; #line 200 "/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" @@ -3561,7 +3528,7 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog saved_search_dialog_search_row_text_on_changed (self); #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (text); -#line 3565 "SavedSearchDialog.c" +#line 3532 "SavedSearchDialog.c" } @@ -3570,12 +3537,12 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; #line 208 "/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" @@ -3596,40 +3563,40 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc if (_tmp7_) { #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = TRUE; -#line 3600 "SavedSearchDialog.c" +#line 3567 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp8_ = 0; + SearchConditionTextContext _tmp8_; #line 210 "/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" _tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; -#line 3607 "SavedSearchDialog.c" +#line 3574 "SavedSearchDialog.c" } #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp1_) { #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3613 "SavedSearchDialog.c" +#line 3580 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp9_ = 0; + SearchConditionTextContext _tmp9_; #line 211 "/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" _tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3620 "SavedSearchDialog.c" +#line 3587 "SavedSearchDialog.c" } #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" result = _tmp0_; #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3626 "SavedSearchDialog.c" +#line 3593 "SavedSearchDialog.c" } static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self) { SearchConditionTextContext result = 0; - GtkComboBoxText* _tmp0_ = NULL; - gint _tmp1_ = 0; + GtkComboBoxText* _tmp0_; + gint _tmp1_; #line 214 "/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" @@ -3640,15 +3607,15 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c result = (SearchConditionTextContext) _tmp1_; #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3644 "SavedSearchDialog.c" +#line 3611 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self) { gboolean _tmp0_ = FALSE; - SearchConditionTextContext _tmp1_ = 0; - SavedSearchDialogSearchRowContainer* _tmp5_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp6_ = NULL; + SearchConditionTextContext _tmp1_; + SavedSearchDialogSearchRowContainer* _tmp5_; + SavedSearchDialogSearchRowContainer* _tmp6_; #line 218 "/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" @@ -3657,39 +3624,39 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) { #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = TRUE; -#line 3661 "SavedSearchDialog.c" +#line 3628 "SavedSearchDialog.c" } else { - SearchConditionTextContext _tmp2_ = 0; + SearchConditionTextContext _tmp2_; #line 220 "/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" _tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; -#line 3668 "SavedSearchDialog.c" +#line 3635 "SavedSearchDialog.c" } #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp0_) { -#line 3672 "SavedSearchDialog.c" - GtkEntry* _tmp3_ = NULL; +#line 3639 "SavedSearchDialog.c" + GtkEntry* _tmp3_; #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->entry; #line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 3678 "SavedSearchDialog.c" +#line 3645 "SavedSearchDialog.c" } else { - GtkEntry* _tmp4_ = NULL; + GtkEntry* _tmp4_; #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp4_ = self->priv->entry; #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 3685 "SavedSearchDialog.c" +#line 3652 "SavedSearchDialog.c" } #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp5_ = self->priv->parent; #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = self->priv->parent; #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp5_, "changed", _tmp6_); -#line 3693 "SavedSearchDialog.c" + 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" } @@ -3701,30 +3668,30 @@ static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSea #line 150 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_widget; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_text_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate; #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_is_complete; -#line 3712 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete; +#line 3679 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) { #line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self); -#line 3719 "SavedSearchDialog.c" +#line 3686 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowText * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkEntry* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkEntry* _tmp2_; + guint _tmp3_; #line 150 "/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" @@ -3749,7 +3716,7 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 150 "/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 3753 "SavedSearchDialog.c" +#line 3720 "SavedSearchDialog.c" } @@ -3768,36 +3735,31 @@ 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" saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self); -#line 3772 "SavedSearchDialog.c" +#line 3739 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowMediaType* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - GtkComboBoxText* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - GtkComboBoxText* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GtkComboBoxText* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GtkComboBoxText* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GtkComboBoxText* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; - GtkComboBoxText* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkComboBoxText* _tmp12_; + GtkBox* _tmp13_; + GtkBox* _tmp14_; + GtkComboBoxText* _tmp15_; + GtkBox* _tmp16_; + GtkComboBoxText* _tmp17_; + GtkBox* _tmp18_; #line 237 "/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" @@ -3821,99 +3783,89 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->media_context; #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("is"); -#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); + gtk_combo_box_text_append_text (_tmp3_, _ ("is")); #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->media_context; + _tmp4_ = self->priv->media_context; #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("is not"); -#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("is not")); #line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->media_context; + _tmp5_ = self->priv->media_context; #line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp8_ = self->priv->media_context; + _tmp6_ = self->priv->media_context; #line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); + 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" - _tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 248 "/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" - self->priv->media_type = _tmp9_; -#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->media_type; + self->priv->media_type = _tmp7_; #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _ ("any photo"); + _tmp8_ = self->priv->media_type; #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp10_, _tmp11_); -#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->media_type; + gtk_combo_box_text_append_text (_tmp8_, _ ("any photo")); #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _ ("a raw photo"); + _tmp9_ = self->priv->media_type; #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp12_, _tmp13_); -#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->media_type; + gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo")); #line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _ ("a video"); + _tmp10_ = self->priv->media_type; #line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp14_, _tmp15_); + gtk_combo_box_text_append_text (_tmp10_, _ ("a video")); #line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->media_type; + _tmp11_ = self->priv->media_type; #line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp17_ = self->priv->media_type; + _tmp12_ = self->priv->media_type; #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self); + 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" - _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp18_); + g_object_ref_sink (_tmp13_); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp18_; + self->priv->box = _tmp13_; #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->box; + _tmp14_ = self->priv->box; #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->media_context; + _tmp15_ = self->priv->media_context; #line 256 "/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); + 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" - _tmp21_ = self->priv->box; + _tmp16_ = self->priv->box; #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->media_type; + _tmp17_ = self->priv->media_type; #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp23_ = self->priv->box; + _tmp18_ = self->priv->box; #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); + 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" return self; -#line 3902 "SavedSearchDialog.c" +#line 3854 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) { #line 237 "/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 3909 "SavedSearchDialog.c" +#line 3861 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowMediaType * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 266 "/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" @@ -3924,7 +3876,7 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav result = _tmp1_; #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3928 "SavedSearchDialog.c" +#line 3880 "SavedSearchDialog.c" } @@ -3932,16 +3884,16 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc SavedSearchDialogSearchRowMediaType * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionMediaTypeContext context = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionMediaTypeMediaType type = 0; - GtkComboBoxText* _tmp4_ = NULL; - gint _tmp5_ = 0; + GtkComboBoxText* _tmp4_; + gint _tmp5_; SearchConditionMediaType* c = NULL; - SearchConditionMediaType* _tmp6_ = NULL; + SearchConditionMediaType* _tmp6_; #line 270 "/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" @@ -3970,21 +3922,21 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 3974 "SavedSearchDialog.c" +#line 3926 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowMediaType * self; SearchConditionMediaType* media = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionMediaType* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionMediaTypeContext _tmp3_ = 0; - SearchConditionMediaTypeContext _tmp4_ = 0; - GtkComboBoxText* _tmp5_ = NULL; - SearchConditionMediaTypeMediaType _tmp6_ = 0; - SearchConditionMediaTypeMediaType _tmp7_ = 0; + SearchCondition* _tmp0_; + SearchConditionMediaType* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionMediaTypeContext _tmp3_; + SearchConditionMediaTypeContext _tmp4_; + GtkComboBoxText* _tmp5_; + SearchConditionMediaTypeMediaType _tmp6_; + SearchConditionMediaTypeMediaType _tmp7_; #line 278 "/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" @@ -4015,7 +3967,7 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch 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" _search_condition_unref0 (media); -#line 4019 "SavedSearchDialog.c" +#line 3971 "SavedSearchDialog.c" } @@ -4028,13 +3980,13 @@ static gboolean saved_search_dialog_search_row_media_type_real_is_complete (Save result = TRUE; #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4032 "SavedSearchDialog.c" +#line 3984 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 289 "/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" @@ -4042,8 +3994,8 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 4047 "SavedSearchDialog.c" + 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" } @@ -4055,30 +4007,30 @@ static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDia #line 230 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_widget; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_is_complete; -#line 4066 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete; +#line 4018 "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" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self); -#line 4073 "SavedSearchDialog.c" +#line 4025 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowMediaType * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkComboBoxText* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkComboBoxText* _tmp2_; + guint _tmp3_; #line 230 "/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" @@ -4103,7 +4055,7 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 230 "/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 4107 "SavedSearchDialog.c" +#line 4059 "SavedSearchDialog.c" } @@ -4122,36 +4074,31 @@ 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" saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self); -#line 4126 "SavedSearchDialog.c" +#line 4078 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowModified* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - GtkComboBoxText* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - GtkComboBoxText* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GtkComboBoxText* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GtkComboBoxText* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GtkComboBoxText* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkBox* _tmp18_ = NULL; - GtkBox* _tmp19_ = NULL; - GtkComboBoxText* _tmp20_ = NULL; - GtkBox* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkComboBoxText* _tmp10_; + GtkComboBoxText* _tmp11_; + GtkComboBoxText* _tmp12_; + GtkBox* _tmp13_; + GtkBox* _tmp14_; + GtkComboBoxText* _tmp15_; + GtkBox* _tmp16_; + GtkComboBoxText* _tmp17_; + GtkBox* _tmp18_; #line 301 "/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" @@ -4175,99 +4122,89 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi #line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->modified_context; #line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("has"); -#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->modified_context; + gtk_combo_box_text_append_text (_tmp3_, _ ("has")); #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("has no"); + _tmp4_ = self->priv->modified_context; #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("has no")); #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->modified_context; + _tmp5_ = self->priv->modified_context; #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp8_ = self->priv->modified_context; + _tmp6_ = self->priv->modified_context; #line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); + 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" - _tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new (); + _tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new (); #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 310 "/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" - self->priv->modified_state = _tmp9_; -#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->modified_state; + self->priv->modified_state = _tmp7_; #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _ ("modifications"); + _tmp8_ = self->priv->modified_state; #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp10_, _tmp11_); + gtk_combo_box_text_append_text (_tmp8_, _ ("modifications")); #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = self->priv->modified_state; -#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _ ("internal modifications"); + _tmp9_ = self->priv->modified_state; #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp12_, _tmp13_); -#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->modified_state; + gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications")); #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = _ ("external modifications"); + _tmp10_ = self->priv->modified_state; #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp14_, _tmp15_); + gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications")); #line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = self->priv->modified_state; + _tmp11_ = self->priv->modified_state; #line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp17_ = self->priv->modified_state; + _tmp12_ = self->priv->modified_state; #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self); + 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" - _tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp18_); + g_object_ref_sink (_tmp13_); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp18_; + self->priv->box = _tmp13_; #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp19_ = self->priv->box; + _tmp14_ = self->priv->box; #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->modified_context; + _tmp15_ = self->priv->modified_context; #line 318 "/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); + 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" - _tmp21_ = self->priv->box; + _tmp16_ = self->priv->box; #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->modified_state; + _tmp17_ = self->priv->modified_state; #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp23_ = self->priv->box; + _tmp18_ = self->priv->box; #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget)); + 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" return self; -#line 4256 "SavedSearchDialog.c" +#line 4193 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) { #line 301 "/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 4263 "SavedSearchDialog.c" +#line 4200 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowModified * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 328 "/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" @@ -4278,7 +4215,7 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved result = _tmp1_; #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4282 "SavedSearchDialog.c" +#line 4219 "SavedSearchDialog.c" } @@ -4286,16 +4223,16 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_ SavedSearchDialogSearchRowModified * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionModifiedContext context = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionModifiedState state = 0; - GtkComboBoxText* _tmp4_ = NULL; - gint _tmp5_ = 0; + GtkComboBoxText* _tmp4_; + gint _tmp5_; SearchConditionModified* c = NULL; - SearchConditionModified* _tmp6_ = NULL; + SearchConditionModified* _tmp6_; #line 332 "/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" @@ -4324,21 +4261,21 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_ result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4328 "SavedSearchDialog.c" +#line 4265 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowModified * self; SearchConditionModified* scm = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionModified* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionModifiedState _tmp3_ = 0; - SearchConditionModifiedState _tmp4_ = 0; - GtkComboBoxText* _tmp5_ = NULL; - SearchConditionModifiedContext _tmp6_ = 0; - SearchConditionModifiedContext _tmp7_ = 0; + SearchCondition* _tmp0_; + SearchConditionModified* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionModifiedState _tmp3_; + SearchConditionModifiedState _tmp4_; + GtkComboBoxText* _tmp5_; + SearchConditionModifiedContext _tmp6_; + SearchConditionModifiedContext _tmp7_; #line 340 "/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" @@ -4369,7 +4306,7 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi 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" _search_condition_unref0 (scm); -#line 4373 "SavedSearchDialog.c" +#line 4310 "SavedSearchDialog.c" } @@ -4382,13 +4319,13 @@ static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedS result = TRUE; #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4386 "SavedSearchDialog.c" +#line 4323 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 351 "/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" @@ -4396,8 +4333,8 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 4401 "SavedSearchDialog.c" + 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" } @@ -4409,30 +4346,30 @@ static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialo #line 294 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_widget; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate; #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_is_complete; -#line 4420 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete; +#line 4357 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) { #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self); -#line 4427 "SavedSearchDialog.c" +#line 4364 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowModified * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkComboBoxText* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkComboBoxText* _tmp2_; + guint _tmp3_; #line 294 "/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" @@ -4457,7 +4394,7 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 294 "/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 4461 "SavedSearchDialog.c" +#line 4398 "SavedSearchDialog.c" } @@ -4476,29 +4413,26 @@ 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" saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self); -#line 4480 "SavedSearchDialog.c" +#line 4417 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowFlagged* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - GtkComboBoxText* _tmp8_ = NULL; - GtkBox* _tmp9_ = NULL; - GtkBox* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkLabel* _tmp13_ = NULL; - GtkBox* _tmp14_ = NULL; - GtkComboBoxText* _tmp15_ = NULL; - GtkBox* _tmp16_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkBox* _tmp7_; + GtkBox* _tmp8_; + GtkLabel* _tmp9_; + GtkLabel* _tmp10_; + GtkBox* _tmp11_; + GtkComboBoxText* _tmp12_; + GtkBox* _tmp13_; #line 362 "/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" @@ -4522,73 +4456,67 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->flagged_state; #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("flagged"); -#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->flagged_state; + gtk_combo_box_text_append_text (_tmp3_, _ ("flagged")); #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("not flagged"); + _tmp4_ = self->priv->flagged_state; #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); + gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged")); #line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->flagged_state; + _tmp5_ = self->priv->flagged_state; #line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp8_ = self->priv->flagged_state; + _tmp6_ = self->priv->flagged_state; #line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self); + 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" - _tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp9_); + g_object_ref_sink (_tmp7_); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp9_; + self->priv->box = _tmp7_; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = self->priv->box; + _tmp8_ = self->priv->box; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = _ ("is"); + _tmp9_ = (GtkLabel*) gtk_label_new (_ ("is")); #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = (GtkLabel*) gtk_label_new (_tmp11_); -#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp12_); + g_object_ref_sink (_tmp9_); #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp10_); #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp14_ = self->priv->box; + _tmp11_ = self->priv->box; #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp15_ = self->priv->flagged_state; + _tmp12_ = self->priv->flagged_state; #line 374 "/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); + 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" - _tmp16_ = self->priv->box; + _tmp13_ = self->priv->box; #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); + 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" return self; -#line 4577 "SavedSearchDialog.c" +#line 4505 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) { #line 362 "/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 4584 "SavedSearchDialog.c" +#line 4512 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowFlagged * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 382 "/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" @@ -4599,7 +4527,7 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS result = _tmp1_; #line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4603 "SavedSearchDialog.c" +#line 4531 "SavedSearchDialog.c" } @@ -4607,13 +4535,13 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c SavedSearchDialogSearchRowFlagged * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionFlaggedState state = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionFlagged* c = NULL; - SearchConditionFlagged* _tmp4_ = NULL; + SearchConditionFlagged* _tmp4_; #line 386 "/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" @@ -4636,18 +4564,18 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4640 "SavedSearchDialog.c" +#line 4568 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowFlagged * self; SearchConditionFlagged* f = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionFlagged* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionFlaggedState _tmp3_ = 0; - SearchConditionFlaggedState _tmp4_ = 0; + SearchCondition* _tmp0_; + SearchConditionFlagged* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionFlaggedState _tmp3_; + SearchConditionFlaggedState _tmp4_; #line 393 "/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" @@ -4670,7 +4598,7 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia 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" _search_condition_unref0 (f); -#line 4674 "SavedSearchDialog.c" +#line 4602 "SavedSearchDialog.c" } @@ -4683,13 +4611,13 @@ static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSe result = TRUE; #line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4687 "SavedSearchDialog.c" +#line 4615 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 403 "/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" @@ -4697,8 +4625,8 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 4702 "SavedSearchDialog.c" + 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" } @@ -4710,28 +4638,28 @@ static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialog #line 356 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_widget; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate; #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_is_complete; -#line 4721 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete; +#line 4649 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) { #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self); -#line 4728 "SavedSearchDialog.c" +#line 4656 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowFlagged * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; #line 356 "/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" @@ -4748,7 +4676,7 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 356 "/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 4752 "SavedSearchDialog.c" +#line 4680 "SavedSearchDialog.c" } @@ -4767,50 +4695,46 @@ 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" saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self); -#line 4771 "SavedSearchDialog.c" +#line 4699 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowRating* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkComboBoxText* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - GtkComboBoxText* _tmp17_ = NULL; - GtkComboBoxText* _tmp18_ = NULL; - GtkComboBoxText* _tmp19_ = NULL; - GtkComboBoxText* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GtkComboBoxText* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GtkComboBoxText* _tmp26_ = NULL; - GtkComboBoxText* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; - GtkBox* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - GtkLabel* _tmp31_ = NULL; - GtkLabel* _tmp32_ = NULL; - GtkBox* _tmp33_ = NULL; - GtkComboBoxText* _tmp34_ = NULL; - GtkBox* _tmp35_ = NULL; - GtkComboBoxText* _tmp36_ = NULL; - GtkBox* _tmp37_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + const gchar* _tmp4_; + GtkComboBoxText* _tmp5_; + const gchar* _tmp6_; + GtkComboBoxText* _tmp7_; + const gchar* _tmp8_; + GtkComboBoxText* _tmp9_; + const gchar* _tmp10_; + GtkComboBoxText* _tmp11_; + const gchar* _tmp12_; + GtkComboBoxText* _tmp13_; + const gchar* _tmp14_; + GtkComboBoxText* _tmp15_; + const gchar* _tmp16_; + GtkComboBoxText* _tmp17_; + GtkComboBoxText* _tmp18_; + GtkComboBoxText* _tmp19_; + GtkComboBoxText* _tmp20_; + GtkComboBoxText* _tmp21_; + GtkComboBoxText* _tmp22_; + GtkComboBoxText* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBox* _tmp25_; + GtkBox* _tmp26_; + GtkLabel* _tmp27_; + GtkLabel* _tmp28_; + GtkBox* _tmp29_; + GtkComboBoxText* _tmp30_; + GtkBox* _tmp31_; + GtkComboBoxText* _tmp32_; + GtkBox* _tmp33_; #line 415 "/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" @@ -4892,85 +4816,77 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp20_ = self->priv->context; #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp21_ = _ ("and higher"); -#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp20_, _tmp21_); -#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp22_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp20_, _ ("and higher")); #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = _ ("only"); + _tmp21_ = self->priv->context; #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp22_, _tmp23_); + gtk_combo_box_text_append_text (_tmp21_, _ ("only")); #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->context; -#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = _ ("and lower"); + _tmp22_ = self->priv->context; #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp24_, _tmp25_); + gtk_combo_box_text_append_text (_tmp22_, _ ("and lower")); #line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp26_ = self->priv->context; + _tmp23_ = self->priv->context; #line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp27_ = self->priv->context; + _tmp24_ = self->priv->context; #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self); + 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" - _tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp28_); + g_object_ref_sink (_tmp25_); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp28_; + self->priv->box = _tmp25_; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = self->priv->box; -#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp30_ = _ ("is"); + _tmp26_ = self->priv->box; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_); + _tmp27_ = (GtkLabel*) gtk_label_new (_ ("is")); #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp31_); + g_object_ref_sink (_tmp27_); #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp32_ = _tmp31_; + _tmp28_ = _tmp27_; #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _g_object_unref0 (_tmp32_); + _g_object_unref0 (_tmp28_); #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp33_ = self->priv->box; + _tmp29_ = self->priv->box; #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp34_ = self->priv->rating; + _tmp30_ = self->priv->rating; #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp35_ = self->priv->box; + _tmp31_ = self->priv->box; #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp36_ = self->priv->context; + _tmp32_ = self->priv->context; #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp37_ = self->priv->box; + _tmp33_ = self->priv->box; #line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget)); + 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" return self; -#line 4959 "SavedSearchDialog.c" +#line 4875 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) { #line 415 "/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 4966 "SavedSearchDialog.c" +#line 4882 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowRating * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 449 "/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" @@ -4981,7 +4897,7 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe result = _tmp1_; #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 4985 "SavedSearchDialog.c" +#line 4901 "SavedSearchDialog.c" } @@ -4989,16 +4905,16 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co SavedSearchDialogSearchRowRating * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; Rating search_rating = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionRatingContext search_context = 0; - GtkComboBoxText* _tmp4_ = NULL; - gint _tmp5_ = 0; + GtkComboBoxText* _tmp4_; + gint _tmp5_; SearchConditionRating* c = NULL; - SearchConditionRating* _tmp6_ = NULL; + SearchConditionRating* _tmp6_; #line 453 "/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" @@ -5027,21 +4943,21 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5031 "SavedSearchDialog.c" +#line 4947 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowRating * self; SearchConditionRating* r = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionRating* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionRatingContext _tmp3_ = 0; - SearchConditionRatingContext _tmp4_ = 0; - GtkComboBoxText* _tmp5_ = NULL; - Rating _tmp6_ = 0; - Rating _tmp7_ = 0; + SearchCondition* _tmp0_; + SearchConditionRating* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionRatingContext _tmp3_; + SearchConditionRatingContext _tmp4_; + GtkComboBoxText* _tmp5_; + Rating _tmp6_; + Rating _tmp7_; #line 461 "/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" @@ -5072,7 +4988,7 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial 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" _search_condition_unref0 (r); -#line 5076 "SavedSearchDialog.c" +#line 4992 "SavedSearchDialog.c" } @@ -5085,13 +5001,13 @@ static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSea result = TRUE; #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5089 "SavedSearchDialog.c" +#line 5005 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 472 "/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" @@ -5099,8 +5015,8 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); -#line 5104 "SavedSearchDialog.c" + 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" } @@ -5112,30 +5028,30 @@ static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogS #line 408 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_widget; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate; #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_is_complete; -#line 5123 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete; +#line 5039 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) { #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self); -#line 5130 "SavedSearchDialog.c" +#line 5046 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowRating * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GtkComboBoxText* _tmp2_ = NULL; - guint _tmp3_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; + GtkComboBoxText* _tmp2_; + guint _tmp3_; #line 408 "/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" @@ -5160,7 +5076,7 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 408 "/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 5164 "SavedSearchDialog.c" +#line 5080 "SavedSearchDialog.c" } @@ -5179,59 +5095,53 @@ 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" saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self); -#line 5183 "SavedSearchDialog.c" +#line 5099 "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" saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 5190 "SavedSearchDialog.c" +#line 5106 "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" saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self); -#line 5197 "SavedSearchDialog.c" +#line 5113 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) { SavedSearchDialogSearchRowDate* self = NULL; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - GtkComboBoxText* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkComboBoxText* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GtkComboBoxText* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkComboBoxText* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - GtkComboBoxText* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GtkComboBoxText* _tmp13_ = NULL; - GtkComboBoxText* _tmp14_ = NULL; - GtkCalendar* _tmp15_ = NULL; - GtkCalendar* _tmp16_ = NULL; - GtkButton* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GtkButton* _tmp19_ = NULL; - GtkButton* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GtkLabel* _tmp22_ = NULL; - GtkBox* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkComboBoxText* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; - GtkButton* _tmp27_ = NULL; - GtkBox* _tmp28_ = NULL; - GtkLabel* _tmp29_ = NULL; - GtkBox* _tmp30_ = NULL; - GtkButton* _tmp31_ = NULL; - GtkBox* _tmp32_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; + GtkComboBoxText* _tmp2_; + GtkComboBoxText* _tmp3_; + GtkComboBoxText* _tmp4_; + GtkComboBoxText* _tmp5_; + GtkComboBoxText* _tmp6_; + GtkComboBoxText* _tmp7_; + GtkComboBoxText* _tmp8_; + GtkComboBoxText* _tmp9_; + GtkCalendar* _tmp10_; + GtkCalendar* _tmp11_; + GtkButton* _tmp12_; + GtkButton* _tmp13_; + GtkButton* _tmp14_; + GtkButton* _tmp15_; + GtkLabel* _tmp16_; + GtkBox* _tmp17_; + GtkBox* _tmp18_; + GtkComboBoxText* _tmp19_; + GtkBox* _tmp20_; + GtkButton* _tmp21_; + GtkBox* _tmp22_; + GtkLabel* _tmp23_; + GtkBox* _tmp24_; + GtkButton* _tmp25_; + GtkBox* _tmp26_; #line 489 "/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" @@ -5255,157 +5165,145 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->context; #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp4_ = _ ("is exactly"); -#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp3_, _tmp4_); -#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp5_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly")); #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp6_ = _ ("is after"); + _tmp4_ = self->priv->context; #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp5_, _tmp6_); -#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp7_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp4_, _ ("is after")); #line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp8_ = _ ("is before"); + _tmp5_ = self->priv->context; #line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp7_, _tmp8_); + gtk_combo_box_text_append_text (_tmp5_, _ ("is before")); #line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp9_ = self->priv->context; + _tmp6_ = self->priv->context; #line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _ ("is between"); -#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp9_, _tmp10_); -#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp11_ = self->priv->context; + gtk_combo_box_text_append_text (_tmp6_, _ ("is between")); #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp12_ = _ ("is not set"); + _tmp7_ = self->priv->context; #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_text_append_text (_tmp11_, _tmp12_); + gtk_combo_box_text_append_text (_tmp7_, _ ("is not set")); #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp13_ = self->priv->context; + _tmp8_ = self->priv->context; #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), 0); + 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" - _tmp14_ = self->priv->context; + _tmp9_ = self->priv->context; #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self); + 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" - _tmp15_ = (GtkCalendar*) gtk_calendar_new (); + _tmp10_ = (GtkCalendar*) gtk_calendar_new (); #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp15_); + g_object_ref_sink (_tmp10_); #line 502 "/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" - self->priv->cal_one = _tmp15_; + self->priv->cal_one = _tmp10_; #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp16_ = (GtkCalendar*) gtk_calendar_new (); + _tmp11_ = (GtkCalendar*) gtk_calendar_new (); #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp11_); #line 503 "/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" - self->priv->cal_two = _tmp16_; + self->priv->cal_two = _tmp11_; #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp17_ = (GtkButton*) gtk_button_new (); + _tmp12_ = (GtkButton*) gtk_button_new (); #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp17_); + g_object_ref_sink (_tmp12_); #line 505 "/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" - self->priv->label_one = _tmp17_; + self->priv->label_one = _tmp12_; #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp18_ = self->priv->label_one; + _tmp13_ = self->priv->label_one; #line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp18_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self); + 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" - _tmp19_ = (GtkButton*) gtk_button_new (); + _tmp14_ = (GtkButton*) gtk_button_new (); #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp19_); + g_object_ref_sink (_tmp14_); #line 507 "/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" - self->priv->label_two = _tmp19_; + self->priv->label_two = _tmp14_; #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = self->priv->label_two; + _tmp15_ = self->priv->label_two; #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_connect (_tmp20_, "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" - _tmp21_ = _ ("and"); + 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" - _tmp22_ = (GtkLabel*) gtk_label_new (_tmp21_); + _tmp16_ = (GtkLabel*) gtk_label_new (_ ("and")); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp22_); + g_object_ref_sink (_tmp16_); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->and); #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->and = _tmp22_; + self->priv->and = _tmp16_; #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); + _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp17_); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->box); #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self->priv->box = _tmp23_; + self->priv->box = _tmp17_; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp24_ = self->priv->box; + _tmp18_ = self->priv->box; #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp25_ = self->priv->context; + _tmp19_ = self->priv->context; #line 513 "/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); + 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" - _tmp26_ = self->priv->box; + _tmp20_ = self->priv->box; #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp27_ = self->priv->label_one; + _tmp21_ = self->priv->label_one; #line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp28_ = self->priv->box; + _tmp22_ = self->priv->box; #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp29_ = self->priv->and; + _tmp23_ = self->priv->and; #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp30_ = self->priv->box; + _tmp24_ = self->priv->box; #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp31_ = self->priv->label_two; + _tmp25_ = self->priv->label_two; #line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); + 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" - _tmp32_ = self->priv->box; + _tmp26_ = self->priv->box; #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); + 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" saved_search_dialog_search_row_date_update_date_labels (self); #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return self; -#line 5384 "SavedSearchDialog.c" +#line 5282 "SavedSearchDialog.c" } static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) { #line 489 "/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 5391 "SavedSearchDialog.c" +#line 5289 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self) { SearchConditionDateContext c = 0; - GtkComboBoxText* _tmp0_ = NULL; - gint _tmp1_ = 0; - SearchConditionDateContext _tmp2_ = 0; - GtkButton* _tmp13_ = NULL; - GDateTime* _tmp14_ = NULL; - GDateTime* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GDateTime* _tmp19_ = NULL; - GDateTime* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + GtkComboBoxText* _tmp0_; + gint _tmp1_; + SearchConditionDateContext _tmp2_; + GtkButton* _tmp13_; + GDateTime* _tmp14_; + GDateTime* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + GtkButton* _tmp18_; + GDateTime* _tmp19_; + GDateTime* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 526 "/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" @@ -5418,10 +5316,10 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp2_ = c; #line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { -#line 5422 "SavedSearchDialog.c" - GtkButton* _tmp3_ = NULL; - GtkLabel* _tmp4_ = NULL; - GtkButton* _tmp5_ = NULL; +#line 5320 "SavedSearchDialog.c" + GtkButton* _tmp3_; + GtkLabel* _tmp4_; + GtkButton* _tmp5_; #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp3_ = self->priv->label_one; #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5434,17 +5332,17 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp5_ = self->priv->label_two; #line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 5438 "SavedSearchDialog.c" +#line 5336 "SavedSearchDialog.c" } else { - SearchConditionDateContext _tmp6_ = 0; + SearchConditionDateContext _tmp6_; #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp6_ = c; #line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) { -#line 5445 "SavedSearchDialog.c" - GtkButton* _tmp7_ = NULL; - GtkLabel* _tmp8_ = NULL; - GtkButton* _tmp9_ = NULL; +#line 5343 "SavedSearchDialog.c" + GtkButton* _tmp7_; + GtkLabel* _tmp8_; + GtkButton* _tmp9_; #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp7_ = self->priv->label_one; #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5457,11 +5355,11 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp9_ = self->priv->label_two; #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 5461 "SavedSearchDialog.c" +#line 5359 "SavedSearchDialog.c" } else { - GtkButton* _tmp10_ = NULL; - GtkLabel* _tmp11_ = NULL; - GtkButton* _tmp12_ = NULL; + GtkButton* _tmp10_; + GtkLabel* _tmp11_; + GtkButton* _tmp12_; #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp10_ = self->priv->label_one; #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5474,7 +5372,7 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _tmp12_ = self->priv->label_two; #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 5478 "SavedSearchDialog.c" +#line 5376 "SavedSearchDialog.c" } } #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5509,15 +5407,15 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD _g_free0 (_tmp22_); #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_date_time_unref0 (_tmp20_); -#line 5513 "SavedSearchDialog.c" +#line 5411 "SavedSearchDialog.c" } static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base) { SavedSearchDialogSearchRowDate * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 549 "/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" @@ -5528,22 +5426,22 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear result = _tmp1_; #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5532 "SavedSearchDialog.c" +#line 5430 "SavedSearchDialog.c" } static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self) { GDateTime* result = NULL; - GtkCalendar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GDateTime* _tmp9_ = NULL; + GtkCalendar* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GDateTime* _tmp9_; #line 553 "/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" @@ -5570,22 +5468,22 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD result = _tmp9_; #line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5574 "SavedSearchDialog.c" +#line 5472 "SavedSearchDialog.c" } static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self) { GDateTime* result = NULL; - GtkCalendar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GDateTime* _tmp9_ = NULL; + GtkCalendar* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GDateTime* _tmp9_; #line 557 "/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" @@ -5612,20 +5510,20 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD result = _tmp9_; #line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5616 "SavedSearchDialog.c" +#line 5514 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date) { - GtkCalendar* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - gint _tmp8_ = 0; + GtkCalendar* _tmp0_; + GDateTime* _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + GDateTime* _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + GDateTime* _tmp7_; + gint _tmp8_; #line 561 "/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" @@ -5654,20 +5552,20 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS _tmp8_ = g_date_time_get_year (_tmp7_); #line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5658 "SavedSearchDialog.c" +#line 5556 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date) { - GtkCalendar* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - gint _tmp2_ = 0; - GtkCalendar* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - gint _tmp5_ = 0; - GtkCalendar* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - gint _tmp8_ = 0; + GtkCalendar* _tmp0_; + GDateTime* _tmp1_; + gint _tmp2_; + GtkCalendar* _tmp3_; + GDateTime* _tmp4_; + gint _tmp5_; + GtkCalendar* _tmp6_; + GDateTime* _tmp7_; + gint _tmp8_; #line 567 "/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" @@ -5696,7 +5594,7 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS _tmp8_ = g_date_time_get_year (_tmp7_); #line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp6_, "year", _tmp8_, NULL); -#line 5700 "SavedSearchDialog.c" +#line 5598 "SavedSearchDialog.c" } @@ -5704,18 +5602,18 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond SavedSearchDialogSearchRowDate * self; SearchCondition* result = NULL; SearchConditionSearchType search_type = 0; - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SearchConditionSearchType _tmp1_ = 0; + SavedSearchDialogSearchRowContainer* _tmp0_; + SearchConditionSearchType _tmp1_; SearchConditionDateContext search_context = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; + GtkComboBoxText* _tmp2_; + gint _tmp3_; SearchConditionDate* c = NULL; - GDateTime* _tmp4_ = NULL; - GDateTime* _tmp5_ = NULL; - GDateTime* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - SearchConditionDate* _tmp8_ = NULL; - SearchConditionDate* _tmp9_ = NULL; + GDateTime* _tmp4_; + GDateTime* _tmp5_; + GDateTime* _tmp6_; + GDateTime* _tmp7_; + SearchConditionDate* _tmp8_; + SearchConditionDate* _tmp9_; #line 573 "/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" @@ -5752,22 +5650,22 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition); #line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5756 "SavedSearchDialog.c" +#line 5654 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) { SavedSearchDialogSearchRowDate * self; SearchConditionDate* cond = NULL; - SearchCondition* _tmp0_ = NULL; - SearchConditionDate* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; - SearchConditionDateContext _tmp3_ = 0; - SearchConditionDateContext _tmp4_ = 0; - GDateTime* _tmp5_ = NULL; - GDateTime* _tmp6_ = NULL; - GDateTime* _tmp7_ = NULL; - GDateTime* _tmp8_ = NULL; + SearchCondition* _tmp0_; + SearchConditionDate* _tmp1_; + GtkComboBoxText* _tmp2_; + SearchConditionDateContext _tmp3_; + SearchConditionDateContext _tmp4_; + GDateTime* _tmp5_; + GDateTime* _tmp6_; + GDateTime* _tmp7_; + GDateTime* _tmp8_; #line 581 "/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" @@ -5804,7 +5702,7 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog saved_search_dialog_search_row_date_update_date_labels (self); #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _search_condition_unref0 (cond); -#line 5808 "SavedSearchDialog.c" +#line 5706 "SavedSearchDialog.c" } @@ -5817,13 +5715,13 @@ static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearc result = TRUE; #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return result; -#line 5821 "SavedSearchDialog.c" +#line 5719 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) { - SavedSearchDialogSearchRowContainer* _tmp0_ = NULL; - SavedSearchDialogSearchRowContainer* _tmp1_ = NULL; + SavedSearchDialogSearchRowContainer* _tmp0_; + SavedSearchDialogSearchRowContainer* _tmp1_; #line 594 "/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" @@ -5831,123 +5729,123 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp1_ = self->priv->parent; #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_signal_emit_by_name (_tmp0_, "changed", _tmp1_); + 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" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5838 "SavedSearchDialog.c" +#line 5736 "SavedSearchDialog.c" } -static Block9Data* block9_data_ref (Block9Data* _data9_) { +static Block10Data* block10_data_ref (Block10Data* _data10_) { #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - g_atomic_int_inc (&_data9_->_ref_count_); + g_atomic_int_inc (&_data10_->_ref_count_); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - return _data9_; -#line 5847 "SavedSearchDialog.c" + return _data10_; +#line 5745 "SavedSearchDialog.c" } -static void block9_data_unref (void * _userdata_) { - Block9Data* _data9_; - _data9_ = (Block9Data*) _userdata_; +static void block10_data_unref (void * _userdata_) { + Block10Data* _data10_; + _data10_ = (Block10Data*) _userdata_; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 5856 "SavedSearchDialog.c" + if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { +#line 5754 "SavedSearchDialog.c" SavedSearchDialogSearchRowDate* self; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = _data9_->self; + self = _data10_->self; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _g_object_unref0 (_data9_->d); + _g_object_unref0 (_data10_->d); #line 599 "/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" - g_slice_free (Block9Data, _data9_); -#line 5866 "SavedSearchDialog.c" + g_slice_free (Block10Data, _data10_); +#line 5764 "SavedSearchDialog.c" } } -static void __lambda12_ (SavedSearchDialogSearchRowDate* self) { +static void __lambda13_ (SavedSearchDialogSearchRowDate* self) { #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_update_date_labels (self); -#line 5874 "SavedSearchDialog.c" +#line 5772 "SavedSearchDialog.c" } -static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { +static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) { #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda12_ ((SavedSearchDialogSearchRowDate*) self); -#line 5881 "SavedSearchDialog.c" + __lambda13_ ((SavedSearchDialogSearchRowDate*) self); +#line 5779 "SavedSearchDialog.c" } -static void __lambda13_ (Block9Data* _data9_) { +static void __lambda14_ (Block10Data* _data10_) { SavedSearchDialogSearchRowDate* self; - GtkDialog* _tmp0_ = NULL; + GtkDialog* _tmp0_; #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - self = _data9_->self; + self = _data10_->self; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp0_ = _data9_->d; + _tmp0_ = _data10_->d; #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT); -#line 5894 "SavedSearchDialog.c" +#line 5792 "SavedSearchDialog.c" } -static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { +static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) { #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - __lambda13_ (self); -#line 5901 "SavedSearchDialog.c" + __lambda14_ (self); +#line 5799 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) { - Block9Data* _data9_; + Block10Data* _data10_; gint orig_day = 0; - GtkCalendar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GtkCalendar* _tmp0_; + gint _tmp1_; + gint _tmp2_; gint orig_month = 0; - GtkCalendar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GtkCalendar* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint orig_year = 0; - GtkCalendar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GtkDialog* _tmp9_ = NULL; - GtkDialog* _tmp10_ = NULL; - GtkDialog* _tmp11_ = NULL; - GtkDialog* _tmp12_ = NULL; - GtkDialog* _tmp13_ = NULL; - GtkBox* _tmp14_ = NULL; - GtkCalendar* _tmp15_ = NULL; + GtkCalendar* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GtkDialog* _tmp9_; + GtkDialog* _tmp10_; + GtkDialog* _tmp11_; + GtkDialog* _tmp12_; + GtkDialog* _tmp13_; + GtkBox* _tmp14_; + GtkCalendar* _tmp15_; gulong id_1 = 0UL; - GtkCalendar* _tmp16_ = NULL; - gulong _tmp17_ = 0UL; + GtkCalendar* _tmp16_; + gulong _tmp17_; gulong id_2 = 0UL; - GtkCalendar* _tmp18_ = NULL; - gulong _tmp19_ = 0UL; - GtkDialog* _tmp20_ = NULL; + GtkCalendar* _tmp18_; + gulong _tmp19_; + GtkDialog* _tmp20_; gint res = 0; - GtkDialog* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - GtkCalendar* _tmp30_ = NULL; - gulong _tmp31_ = 0UL; - GtkCalendar* _tmp32_ = NULL; - gulong _tmp33_ = 0UL; - GtkDialog* _tmp34_ = NULL; + GtkDialog* _tmp21_; + gint _tmp22_; + gint _tmp23_; + GtkCalendar* _tmp30_; + gulong _tmp31_; + GtkCalendar* _tmp32_; + gulong _tmp33_; + GtkDialog* _tmp34_; #line 599 "/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" g_return_if_fail (GTK_IS_CALENDAR (cal)); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_ = g_slice_new0 (Block9Data); + _data10_ = g_slice_new0 (Block10Data); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->_ref_count_ = 1; + _data10_->_ref_count_ = 1; #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->self = saved_search_dialog_search_row_ref (self); + _data10_->self = saved_search_dialog_search_row_ref (self); #line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp0_ = cal; #line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -5977,21 +5875,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_ref_sink (_tmp9_); #line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_->d = _tmp9_; + _data10_->d = _tmp9_; #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp10_ = _data9_->d; + _tmp10_ = _data10_->d; #line 606 "/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" - _tmp11_ = _data9_->d; + _tmp11_ = _data10_->d; #line 607 "/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" - _tmp12_ = _data9_->d; + _tmp12_ = _data10_->d; #line 608 "/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" - _tmp13_ = _data9_->d; + _tmp13_ = _data10_->d; #line 609 "/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" @@ -6001,21 +5899,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 610 "/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) ___lambda12__gtk_calendar_day_selected, self); + _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self); #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" id_1 = _tmp17_; #line 611 "/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) ___lambda13__gtk_calendar_day_selected_double_click, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); + _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" id_2 = _tmp19_; #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _tmp20_ = _data9_->d; + _tmp20_ = _data10_->d; #line 614 "/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" - _tmp21_ = _data9_->d; + _tmp21_ = _data10_->d; #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp22_ = gtk_dialog_run (_tmp21_); #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6024,13 +5922,13 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo _tmp23_ = res; #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) { -#line 6028 "SavedSearchDialog.c" - GtkCalendar* _tmp24_ = NULL; - gint _tmp25_ = 0; - GtkCalendar* _tmp26_ = NULL; - gint _tmp27_ = 0; - GtkCalendar* _tmp28_ = NULL; - gint _tmp29_ = 0; +#line 5926 "SavedSearchDialog.c" + GtkCalendar* _tmp24_; + gint _tmp25_; + GtkCalendar* _tmp26_; + gint _tmp27_; + GtkCalendar* _tmp28_; + gint _tmp29_; #line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp24_ = cal; #line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" @@ -6049,7 +5947,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo _tmp29_ = orig_year; #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_object_set (_tmp28_, "year", _tmp29_, NULL); -#line 6053 "SavedSearchDialog.c" +#line 5951 "SavedSearchDialog.c" } #line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _tmp30_ = cal; @@ -6064,40 +5962,40 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo #line 623 "/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" - _tmp34_ = _data9_->d; + _tmp34_ = _data10_->d; #line 624 "/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" saved_search_dialog_search_row_date_update_date_labels (self); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - block9_data_unref (_data9_); + block10_data_unref (_data10_); #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - _data9_ = NULL; -#line 6077 "SavedSearchDialog.c" + _data10_ = NULL; +#line 5975 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) { - GtkCalendar* _tmp0_ = NULL; + GtkCalendar* _tmp0_; #line 628 "/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" _tmp0_ = self->priv->cal_one; #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 6089 "SavedSearchDialog.c" +#line 5987 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) { - GtkCalendar* _tmp0_ = NULL; + GtkCalendar* _tmp0_; #line 632 "/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" _tmp0_ = self->priv->cal_two; #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_); -#line 6101 "SavedSearchDialog.c" +#line 5999 "SavedSearchDialog.c" } @@ -6109,28 +6007,28 @@ static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSea #line 477 "/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" - ((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_widget; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_get_search_condition; + ((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" - ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*)(SavedSearchDialogSearchRow*, SearchCondition*)) saved_search_dialog_search_row_date_real_populate; + ((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate; #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" - ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_is_complete; -#line 6120 "SavedSearchDialog.c" + ((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete; +#line 6018 "SavedSearchDialog.c" } static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) { #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self); -#line 6127 "SavedSearchDialog.c" +#line 6025 "SavedSearchDialog.c" } -static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj) { +static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj) { SavedSearchDialogSearchRowDate * self; - GtkComboBoxText* _tmp0_ = NULL; - guint _tmp1_ = 0U; + GtkComboBoxText* _tmp0_; + guint _tmp1_; #line 477 "/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" @@ -6157,7 +6055,7 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc _saved_search_dialog_search_row_container_unref0 (self->priv->parent); #line 477 "/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 6161 "SavedSearchDialog.c" +#line 6059 "SavedSearchDialog.c" } @@ -6176,7 +6074,7 @@ 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 6180 "SavedSearchDialog.c" +#line 6078 "SavedSearchDialog.c" } @@ -6185,7 +6083,7 @@ static void value_saved_search_dialog_free_value (GValue* value) { 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 6189 "SavedSearchDialog.c" +#line 6087 "SavedSearchDialog.c" } } @@ -6195,11 +6093,11 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu 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 6199 "SavedSearchDialog.c" +#line 6097 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" dest_value->data[0].v_pointer = NULL; -#line 6203 "SavedSearchDialog.c" +#line 6101 "SavedSearchDialog.c" } } @@ -6207,66 +6105,66 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu 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 6211 "SavedSearchDialog.c" +#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 6218 "SavedSearchDialog.c" - SavedSearchDialog* object; +#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 6225 "SavedSearchDialog.c" +#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 6229 "SavedSearchDialog.c" +#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 6233 "SavedSearchDialog.c" +#line 6131 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6237 "SavedSearchDialog.c" +#line 6135 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 6241 "SavedSearchDialog.c" +#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; + 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 6252 "SavedSearchDialog.c" +#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 6258 "SavedSearchDialog.c" +#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 6262 "SavedSearchDialog.c" +#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 6266 "SavedSearchDialog.c" +#line 6164 "SavedSearchDialog.c" } #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return NULL; -#line 6270 "SavedSearchDialog.c" +#line 6168 "SavedSearchDialog.c" } @@ -6280,7 +6178,7 @@ GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" return G_PARAM_SPEC (spec); -#line 6284 "SavedSearchDialog.c" +#line 6182 "SavedSearchDialog.c" } @@ -6289,12 +6187,12 @@ gpointer value_get_saved_search_dialog (const GValue* value) { 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 6293 "SavedSearchDialog.c" +#line 6191 "SavedSearchDialog.c" } void value_set_saved_search_dialog (GValue* value, gpointer v_object) { - SavedSearchDialog* old; + 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" @@ -6309,23 +6207,23 @@ void value_set_saved_search_dialog (GValue* value, gpointer v_object) { 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 6313 "SavedSearchDialog.c" +#line 6211 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6317 "SavedSearchDialog.c" +#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 6323 "SavedSearchDialog.c" +#line 6221 "SavedSearchDialog.c" } } void value_take_saved_search_dialog (GValue* value, gpointer v_object) { - SavedSearchDialog* old; + 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" @@ -6338,17 +6236,17 @@ void value_take_saved_search_dialog (GValue* value, gpointer v_object) { 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 6342 "SavedSearchDialog.c" +#line 6240 "SavedSearchDialog.c" } else { #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" value->data[0].v_pointer = NULL; -#line 6346 "SavedSearchDialog.c" +#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 6352 "SavedSearchDialog.c" +#line 6250 "SavedSearchDialog.c" } } @@ -6360,12 +6258,12 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) { ((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate)); -#line 6364 "SavedSearchDialog.c" +#line 6262 "SavedSearchDialog.c" } static void saved_search_dialog_instance_init (SavedSearchDialog * self) { - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; #line 8 "/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" @@ -6380,14 +6278,14 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) { self->priv->valid = FALSE; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" self->ref_count = 1; -#line 6384 "SavedSearchDialog.c" +#line 6282 "SavedSearchDialog.c" } -static void saved_search_dialog_finalize (SavedSearchDialog* obj) { +static void saved_search_dialog_finalize (SavedSearchDialog * obj) { SavedSearchDialog * self; - GtkEntry* _tmp0_ = NULL; - guint _tmp1_ = 0U; + GtkEntry* _tmp0_; + guint _tmp1_; #line 8 "/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" @@ -6414,7 +6312,7 @@ static void saved_search_dialog_finalize (SavedSearchDialog* obj) { _g_object_unref0 (self->priv->row_list); #line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" _g_object_unref0 (self->priv->previous_search); -#line 6418 "SavedSearchDialog.c" +#line 6316 "SavedSearchDialog.c" } @@ -6433,18 +6331,18 @@ GType saved_search_dialog_get_type (void) { gpointer saved_search_dialog_ref (gpointer instance) { - SavedSearchDialog* self; + 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 6443 "SavedSearchDialog.c" +#line 6341 "SavedSearchDialog.c" } void saved_search_dialog_unref (gpointer instance) { - SavedSearchDialog* self; + SavedSearchDialog * self; self = instance; #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -6452,7 +6350,7 @@ void saved_search_dialog_unref (gpointer instance) { 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 6456 "SavedSearchDialog.c" +#line 6354 "SavedSearchDialog.c" } } |