diff options
Diffstat (limited to 'src/SearchFilter.c')
| -rw-r--r-- | src/SearchFilter.c | 1675 |
1 files changed, 867 insertions, 808 deletions
diff --git a/src/SearchFilter.c b/src/SearchFilter.c index b6c0196..d439603 100644 --- a/src/SearchFilter.c +++ b/src/SearchFilter.c @@ -1,4 +1,4 @@ -/* SearchFilter.c generated by valac 0.34.2, the Vala compiler +/* SearchFilter.c generated by valac 0.32.1, the Vala compiler * generated from SearchFilter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1176,11 +1176,16 @@ GType library_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive); void search_filter_actions_reset (SearchFilterActions* self); -GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self); +GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self); +static GVariant* _variant_new32 (gboolean value); GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self); +static GVariant* _variant_new33 (gboolean value); GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self); +static GVariant* _variant_new34 (gboolean value); GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self); -static GVariant* _variant_new28 (gchar* value); +static GVariant* _variant_new35 (gboolean value); +static GVariant* _variant_new36 (gchar* value); +GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self); void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria); static void search_filter_actions_update_sensitivities (SearchFilterActions* self); GType page_get_type (void) G_GNUC_CONST; @@ -1214,13 +1219,12 @@ GType camera_accumulator_get_type (void) G_GNUC_CONST; gint camera_accumulator_get_photos (CameraAccumulator* self); gint camera_accumulator_get_videos (CameraAccumulator* self); gint camera_accumulator_get_raw (CameraAccumulator* self); -static gboolean _variant_get29 (GVariant* value); -static GVariant* _variant_new30 (gboolean value); +static gboolean _variant_get37 (GVariant* value); +static GVariant* _variant_new38 (gboolean value); gboolean search_filter_actions_get_has_photos (SearchFilterActions* self); gboolean search_filter_actions_get_has_videos (SearchFilterActions* self); gboolean search_filter_actions_get_has_raw (SearchFilterActions* self); gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self); -GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self); static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void search_filter_actions_finalize (SearchFilterActions* obj); GType search_filter_toolbar_get_type (void) G_GNUC_CONST; @@ -1286,9 +1290,9 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc #define RESOURCES_ICON_FILTER_FLAGGED "filter-flagged" #define RESOURCES_ICON_FILTER_FLAGGED_DISABLED "filter-flagged-disabled" LibraryWindow* library_window_get_app (void); -static GVariant* _variant_new31 (gboolean value); +static GVariant* _variant_new39 (gboolean value); void search_filter_toolbar_update (SearchFilterToolbar* self); -static GVariant* _variant_new32 (gboolean value); +static GVariant* _variant_new40 (gboolean value); void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter); void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self); void library_window_show_search_bar (LibraryWindow* self, gboolean display); @@ -1476,7 +1480,7 @@ static guint search_view_filter_real_get_criteria (SearchViewFilter* self) { g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala" return 0U; -#line 1480 "SearchFilter.c" +#line 1484 "SearchFilter.c" } @@ -1485,7 +1489,7 @@ guint search_view_filter_get_criteria (SearchViewFilter* self) { g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), 0U); #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala" return SEARCH_VIEW_FILTER_GET_CLASS (self)->get_criteria (self); -#line 1489 "SearchFilter.c" +#line 1493 "SearchFilter.c" } @@ -1504,7 +1508,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter switch (_tmp1_) { #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_ONLY: -#line 1508 "SearchFilter.c" +#line 1512 "SearchFilter.c" { #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_REJECTED; @@ -1512,11 +1516,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 73 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1516 "SearchFilter.c" +#line 1520 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 1520 "SearchFilter.c" +#line 1524 "SearchFilter.c" { #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_REJECTED; @@ -1524,11 +1528,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 78 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1528 "SearchFilter.c" +#line 1532 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 1532 "SearchFilter.c" +#line 1536 "SearchFilter.c" { #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_ONE; @@ -1536,11 +1540,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 83 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1540 "SearchFilter.c" +#line 1544 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_ONLY: -#line 1544 "SearchFilter.c" +#line 1548 "SearchFilter.c" { #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_ONE; @@ -1548,11 +1552,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 88 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1552 "SearchFilter.c" +#line 1556 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 1556 "SearchFilter.c" +#line 1560 "SearchFilter.c" { #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_TWO; @@ -1560,11 +1564,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 93 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1564 "SearchFilter.c" +#line 1568 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_ONLY: -#line 1568 "SearchFilter.c" +#line 1572 "SearchFilter.c" { #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_TWO; @@ -1572,11 +1576,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 98 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1576 "SearchFilter.c" +#line 1580 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 1580 "SearchFilter.c" +#line 1584 "SearchFilter.c" { #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_THREE; @@ -1584,11 +1588,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 103 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1588 "SearchFilter.c" +#line 1592 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_ONLY: -#line 1592 "SearchFilter.c" +#line 1596 "SearchFilter.c" { #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_THREE; @@ -1596,11 +1600,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 108 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1600 "SearchFilter.c" +#line 1604 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 1604 "SearchFilter.c" +#line 1608 "SearchFilter.c" { #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FOUR; @@ -1608,11 +1612,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 113 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1612 "SearchFilter.c" +#line 1616 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_ONLY: -#line 1616 "SearchFilter.c" +#line 1620 "SearchFilter.c" { #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FOUR; @@ -1620,11 +1624,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 118 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1624 "SearchFilter.c" +#line 1628 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 1628 "SearchFilter.c" +#line 1632 "SearchFilter.c" { #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FIVE; @@ -1632,11 +1636,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 123 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1636 "SearchFilter.c" +#line 1640 "SearchFilter.c" } #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_ONLY: -#line 1640 "SearchFilter.c" +#line 1644 "SearchFilter.c" { #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_FIVE; @@ -1644,12 +1648,12 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = FALSE; #line 128 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1648 "SearchFilter.c" +#line 1652 "SearchFilter.c" } default: #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 1653 "SearchFilter.c" +#line 1657 "SearchFilter.c" { #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->rating = RATING_UNRATED; @@ -1657,7 +1661,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter self->priv->rating_allow_higher = TRUE; #line 134 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 1661 "SearchFilter.c" +#line 1665 "SearchFilter.c" } } } @@ -1677,7 +1681,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) { result = !_tmp1_; #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1681 "SearchFilter.c" +#line 1685 "SearchFilter.c" } @@ -1692,7 +1696,7 @@ const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) { result = _tmp0_; #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1696 "SearchFilter.c" +#line 1700 "SearchFilter.c" } @@ -1716,13 +1720,13 @@ gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* if (result_length1) { #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala" *result_length1 = _tmp1__length1; -#line 1720 "SearchFilter.c" +#line 1724 "SearchFilter.c" } #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp1_; #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1726 "SearchFilter.c" +#line 1730 "SearchFilter.c" } @@ -1733,17 +1737,17 @@ static gchar** _vala_array_dup32 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (i = 0; i < length; i++) { -#line 1737 "SearchFilter.c" +#line 1741 "SearchFilter.c" gchar* _tmp0_ = NULL; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = g_strdup (self[i]); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" result[i] = _tmp0_; -#line 1743 "SearchFilter.c" +#line 1747 "SearchFilter.c" } #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1747 "SearchFilter.c" +#line 1751 "SearchFilter.c" } @@ -1766,7 +1770,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* _tmp2_ = is_string_empty (_tmp1_); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!_tmp2_) { -#line 1770 "SearchFilter.c" +#line 1774 "SearchFilter.c" const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -1777,13 +1781,13 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* _g_free0 (_tmp0_); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = _tmp4_; -#line 1781 "SearchFilter.c" +#line 1785 "SearchFilter.c" } else { #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (_tmp0_); #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = NULL; -#line 1787 "SearchFilter.c" +#line 1791 "SearchFilter.c" } #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = g_strdup (_tmp0_); @@ -1795,7 +1799,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* _tmp7_ = self->priv->search_filter; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp7_ != NULL) { -#line 1799 "SearchFilter.c" +#line 1803 "SearchFilter.c" const gchar* _tmp8_ = NULL; gchar** _tmp9_ = NULL; gchar** _tmp10_ = NULL; @@ -1811,7 +1815,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* _tmp6__length1 = _vala_array_length (_tmp9_); #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" __tmp6__size_ = _tmp6__length1; -#line 1815 "SearchFilter.c" +#line 1819 "SearchFilter.c" } else { #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); @@ -1821,7 +1825,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* _tmp6__length1 = 0; #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" __tmp6__size_ = _tmp6__length1; -#line 1825 "SearchFilter.c" +#line 1829 "SearchFilter.c" } #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); @@ -1839,7 +1843,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (_tmp0_); -#line 1843 "SearchFilter.c" +#line 1847 "SearchFilter.c" } @@ -1858,7 +1862,7 @@ void search_view_filter_clear_search_filter (SearchViewFilter* self) { self->priv->search_filter_words_length1 = 0; #line 157 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1; -#line 1862 "SearchFilter.c" +#line 1866 "SearchFilter.c" } @@ -1873,7 +1877,7 @@ gboolean search_view_filter_has_saved_search (SearchViewFilter* self) { result = _tmp0_ != NULL; #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1877 "SearchFilter.c" +#line 1881 "SearchFilter.c" } @@ -1888,7 +1892,7 @@ gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) { result = _tmp0_; #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1892 "SearchFilter.c" +#line 1896 "SearchFilter.c" } @@ -1903,7 +1907,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) { result = _tmp0_; #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1907 "SearchFilter.c" +#line 1911 "SearchFilter.c" } @@ -1921,31 +1925,31 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) { if (_tmp3_) { #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = TRUE; -#line 1925 "SearchFilter.c" +#line 1929 "SearchFilter.c" } else { gboolean _tmp4_ = FALSE; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->_show_media_photos; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _tmp4_; -#line 1932 "SearchFilter.c" +#line 1936 "SearchFilter.c" } #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp2_) { #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = TRUE; -#line 1938 "SearchFilter.c" +#line 1942 "SearchFilter.c" } else { gboolean _tmp5_ = FALSE; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->_show_media_raw; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _tmp5_; -#line 1945 "SearchFilter.c" +#line 1949 "SearchFilter.c" } #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_) { -#line 1949 "SearchFilter.c" +#line 1953 "SearchFilter.c" gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; @@ -1953,45 +1957,45 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) { _tmp8_ = self->priv->_show_media_video; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp8_) { -#line 1957 "SearchFilter.c" +#line 1961 "SearchFilter.c" gboolean _tmp9_ = FALSE; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = self->priv->_show_media_photos; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = _tmp9_; -#line 1963 "SearchFilter.c" +#line 1967 "SearchFilter.c" } else { #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = FALSE; -#line 1967 "SearchFilter.c" +#line 1971 "SearchFilter.c" } #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp7_) { -#line 1971 "SearchFilter.c" +#line 1975 "SearchFilter.c" gboolean _tmp10_ = FALSE; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->_show_media_raw; #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = _tmp10_; -#line 1977 "SearchFilter.c" +#line 1981 "SearchFilter.c" } else { #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = FALSE; -#line 1981 "SearchFilter.c" +#line 1985 "SearchFilter.c" } #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = !_tmp6_; -#line 1985 "SearchFilter.c" +#line 1989 "SearchFilter.c" } else { #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = FALSE; -#line 1989 "SearchFilter.c" +#line 1993 "SearchFilter.c" } #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 1995 "SearchFilter.c" +#line 1999 "SearchFilter.c" } @@ -2001,7 +2005,7 @@ SearchViewFilter* search_view_filter_construct (GType object_type) { self = (SearchViewFilter*) view_filter_construct (object_type); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 2005 "SearchFilter.c" +#line 2009 "SearchFilter.c" } @@ -2016,7 +2020,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) { result = _tmp0_; #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2020 "SearchFilter.c" +#line 2024 "SearchFilter.c" } @@ -2028,7 +2032,7 @@ void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value) { _tmp0_ = value; #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_flagged = _tmp0_; -#line 2032 "SearchFilter.c" +#line 2036 "SearchFilter.c" } @@ -2043,7 +2047,7 @@ gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) { result = _tmp0_; #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2047 "SearchFilter.c" +#line 2051 "SearchFilter.c" } @@ -2055,7 +2059,7 @@ void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean v _tmp0_ = value; #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_show_media_video = _tmp0_; -#line 2059 "SearchFilter.c" +#line 2063 "SearchFilter.c" } @@ -2070,7 +2074,7 @@ gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) { result = _tmp0_; #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2074 "SearchFilter.c" +#line 2078 "SearchFilter.c" } @@ -2082,7 +2086,7 @@ void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean _tmp0_ = value; #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_show_media_photos = _tmp0_; -#line 2086 "SearchFilter.c" +#line 2090 "SearchFilter.c" } @@ -2097,7 +2101,7 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) { result = _tmp0_; #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2101 "SearchFilter.c" +#line 2105 "SearchFilter.c" } @@ -2109,7 +2113,7 @@ void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean val _tmp0_ = value; #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_show_media_raw = _tmp0_; -#line 2113 "SearchFilter.c" +#line 2117 "SearchFilter.c" } @@ -2124,14 +2128,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) { result = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2128 "SearchFilter.c" +#line 2132 "SearchFilter.c" } static gpointer _g_object_ref0 (gpointer self) { #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? g_object_ref (self) : NULL; -#line 2135 "SearchFilter.c" +#line 2139 "SearchFilter.c" } @@ -2148,7 +2152,7 @@ void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* v _g_object_unref0 (self->priv->_saved_search); #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_saved_search = _tmp1_; -#line 2152 "SearchFilter.c" +#line 2156 "SearchFilter.c" } @@ -2161,7 +2165,7 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) { g_type_class_add_private (klass, sizeof (SearchViewFilterPrivate)); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((SearchViewFilterClass *) klass)->get_criteria = search_view_filter_real_get_criteria; -#line 2165 "SearchFilter.c" +#line 2169 "SearchFilter.c" } @@ -2192,7 +2196,7 @@ static void search_view_filter_instance_init (SearchViewFilter * self) { self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1; #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_saved_search = NULL; -#line 2196 "SearchFilter.c" +#line 2200 "SearchFilter.c" } @@ -2208,7 +2212,7 @@ static void search_view_filter_finalize (ViewFilter* obj) { _g_object_unref0 (self->priv->_saved_search); #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala" VIEW_FILTER_CLASS (search_view_filter_parent_class)->finalize (obj); -#line 2212 "SearchFilter.c" +#line 2216 "SearchFilter.c" } @@ -2228,19 +2232,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; -#line 2244 "SearchFilter.c" +#line 2248 "SearchFilter.c" } @@ -2278,14 +2282,14 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp3_ = criteria; #line 186 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((SEARCH_FILTER_CRITERIA_RATING & _tmp3_) != 0) { -#line 2282 "SearchFilter.c" +#line 2286 "SearchFilter.c" gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp5_) { -#line 2289 "SearchFilter.c" +#line 2293 "SearchFilter.c" MediaSource* _tmp6_ = NULL; Rating _tmp7_ = 0; Rating _tmp8_ = 0; @@ -2297,11 +2301,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp8_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = _tmp7_ < _tmp8_; -#line 2301 "SearchFilter.c" +#line 2305 "SearchFilter.c" } else { #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = FALSE; -#line 2305 "SearchFilter.c" +#line 2309 "SearchFilter.c" } #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp4_) { @@ -2311,7 +2315,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2315 "SearchFilter.c" +#line 2319 "SearchFilter.c" } else { gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; @@ -2319,7 +2323,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp10_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!_tmp10_) { -#line 2323 "SearchFilter.c" +#line 2327 "SearchFilter.c" MediaSource* _tmp11_ = NULL; Rating _tmp12_ = 0; Rating _tmp13_ = 0; @@ -2331,11 +2335,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp13_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = _tmp12_ != _tmp13_; -#line 2335 "SearchFilter.c" +#line 2339 "SearchFilter.c" } else { #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = FALSE; -#line 2339 "SearchFilter.c" +#line 2343 "SearchFilter.c" } #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp9_) { @@ -2345,7 +2349,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2349 "SearchFilter.c" +#line 2353 "SearchFilter.c" } } } @@ -2353,7 +2357,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp14_ = criteria; #line 194 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp14_) != 0) { -#line 2357 "SearchFilter.c" +#line 2361 "SearchFilter.c" gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; gboolean _tmp17_ = FALSE; @@ -2364,21 +2368,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp18_ = _tmp17_; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp18_) { -#line 2368 "SearchFilter.c" +#line 2372 "SearchFilter.c" MediaSource* _tmp19_ = NULL; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp19_ = source; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE); -#line 2374 "SearchFilter.c" +#line 2378 "SearchFilter.c" } else { #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp16_ = FALSE; -#line 2378 "SearchFilter.c" +#line 2382 "SearchFilter.c" } #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp16_) { -#line 2382 "SearchFilter.c" +#line 2386 "SearchFilter.c" MediaSource* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2387,11 +2391,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp21_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_FLAGGABLE, Flaggable)); #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp15_ = !_tmp21_; -#line 2391 "SearchFilter.c" +#line 2395 "SearchFilter.c" } else { #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp15_ = FALSE; -#line 2395 "SearchFilter.c" +#line 2399 "SearchFilter.c" } #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp15_) { @@ -2401,34 +2405,34 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2405 "SearchFilter.c" +#line 2409 "SearchFilter.c" } } #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp23_ = criteria; #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((SEARCH_FILTER_CRITERIA_MEDIA & _tmp23_) != 0) { -#line 2412 "SearchFilter.c" +#line 2416 "SearchFilter.c" gboolean _tmp24_ = FALSE; #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp24_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp22_ = _tmp24_; -#line 2418 "SearchFilter.c" +#line 2422 "SearchFilter.c" } else { #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp22_ = FALSE; -#line 2422 "SearchFilter.c" +#line 2426 "SearchFilter.c" } #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp22_) { -#line 2426 "SearchFilter.c" +#line 2430 "SearchFilter.c" MediaSource* _tmp25_ = NULL; #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp25_ = source; #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO_SOURCE)) { -#line 2432 "SearchFilter.c" +#line 2436 "SearchFilter.c" gboolean _tmp26_ = FALSE; gboolean _tmp27_ = FALSE; #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2443,7 +2447,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2447 "SearchFilter.c" +#line 2451 "SearchFilter.c" } } else { MediaSource* _tmp28_ = NULL; @@ -2451,7 +2455,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp28_ = source; #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_PHOTO)) { -#line 2455 "SearchFilter.c" +#line 2459 "SearchFilter.c" Photo* photo = NULL; MediaSource* _tmp29_ = NULL; Photo* _tmp30_ = NULL; @@ -2469,7 +2473,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp32_ = photo_get_master_file_format (_tmp31_); #line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp32_ == PHOTO_FILE_FORMAT_RAW) { -#line 2473 "SearchFilter.c" +#line 2477 "SearchFilter.c" Photo* _tmp33_ = NULL; gboolean _tmp34_ = FALSE; #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2478,7 +2482,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp34_ = photo_is_raw_developer_available (_tmp33_, RAW_DEVELOPER_CAMERA); #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp34_) { -#line 2482 "SearchFilter.c" +#line 2486 "SearchFilter.c" gboolean _tmp35_ = FALSE; gboolean _tmp36_ = FALSE; gboolean _tmp37_ = FALSE; @@ -2488,7 +2492,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp37_ = _tmp36_; #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!_tmp37_) { -#line 2492 "SearchFilter.c" +#line 2496 "SearchFilter.c" gboolean _tmp38_ = FALSE; gboolean _tmp39_ = FALSE; #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2497,11 +2501,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp39_ = _tmp38_; #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp35_ = !_tmp39_; -#line 2501 "SearchFilter.c" +#line 2505 "SearchFilter.c" } else { #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp35_ = FALSE; -#line 2505 "SearchFilter.c" +#line 2509 "SearchFilter.c" } #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp35_) { @@ -2513,7 +2517,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2517 "SearchFilter.c" +#line 2521 "SearchFilter.c" } } else { gboolean _tmp40_ = FALSE; @@ -2532,7 +2536,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2536 "SearchFilter.c" +#line 2540 "SearchFilter.c" } } } else { @@ -2552,12 +2556,12 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2556 "SearchFilter.c" +#line 2560 "SearchFilter.c" } } #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (photo); -#line 2561 "SearchFilter.c" +#line 2565 "SearchFilter.c" } } } @@ -2565,21 +2569,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp45_ = criteria; #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp45_) != 0) { -#line 2569 "SearchFilter.c" +#line 2573 "SearchFilter.c" gboolean _tmp46_ = FALSE; #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp46_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp44_ = _tmp46_; -#line 2575 "SearchFilter.c" +#line 2579 "SearchFilter.c" } else { #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp44_ = FALSE; -#line 2579 "SearchFilter.c" +#line 2583 "SearchFilter.c" } #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp44_) { -#line 2583 "SearchFilter.c" +#line 2587 "SearchFilter.c" const gchar* media_keywords = NULL; MediaSource* _tmp47_ = NULL; const gchar* _tmp48_ = NULL; @@ -2615,7 +2619,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp51_ = event; #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp51_ != NULL) { -#line 2619 "SearchFilter.c" +#line 2623 "SearchFilter.c" Event* _tmp52_ = NULL; const gchar* _tmp53_ = NULL; #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2624,7 +2628,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp53_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_INDEXABLE, Indexable)); #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala" event_keywords = _tmp53_; -#line 2628 "SearchFilter.c" +#line 2632 "SearchFilter.c" } #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp54_ = tag_global; @@ -2638,7 +2642,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp58_ = tags; #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp58_ != NULL) { -#line 2642 "SearchFilter.c" +#line 2646 "SearchFilter.c" GeeList* _tmp59_ = NULL; gint _tmp60_ = 0; gint _tmp61_ = 0; @@ -2650,17 +2654,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp61_ = _tmp60_; #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp57_ = _tmp61_; -#line 2654 "SearchFilter.c" +#line 2658 "SearchFilter.c" } else { #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp57_ = 0; -#line 2658 "SearchFilter.c" +#line 2662 "SearchFilter.c" } #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala" tags_size = _tmp57_; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp63_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp62_); -#line 2664 "SearchFilter.c" +#line 2668 "SearchFilter.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; @@ -2672,11 +2676,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat word_collection_length1 = _tmp62_; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (word_it = 0; word_it < _tmp62_; word_it = word_it + 1) { -#line 2676 "SearchFilter.c" +#line 2680 "SearchFilter.c" const gchar* word = NULL; #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala" word = word_collection[word_it]; -#line 2680 "SearchFilter.c" +#line 2684 "SearchFilter.c" { gboolean _tmp64_ = FALSE; const gchar* _tmp65_ = NULL; @@ -2687,7 +2691,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp65_ = media_keywords; #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp65_ != NULL) { -#line 2691 "SearchFilter.c" +#line 2695 "SearchFilter.c" const gchar* _tmp66_ = NULL; const gchar* _tmp67_ = NULL; gboolean _tmp68_ = FALSE; @@ -2699,23 +2703,23 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp68_ = string_contains (_tmp66_, _tmp67_); #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp64_ = _tmp68_; -#line 2703 "SearchFilter.c" +#line 2707 "SearchFilter.c" } else { #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp64_ = FALSE; -#line 2707 "SearchFilter.c" +#line 2711 "SearchFilter.c" } #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp64_) { #line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala" continue; -#line 2713 "SearchFilter.c" +#line 2717 "SearchFilter.c" } #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp70_ = event_keywords; #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp70_ != NULL) { -#line 2719 "SearchFilter.c" +#line 2723 "SearchFilter.c" const gchar* _tmp71_ = NULL; const gchar* _tmp72_ = NULL; gboolean _tmp73_ = FALSE; @@ -2727,40 +2731,40 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp73_ = string_contains (_tmp71_, _tmp72_); #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp69_ = _tmp73_; -#line 2731 "SearchFilter.c" +#line 2735 "SearchFilter.c" } else { #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp69_ = FALSE; -#line 2735 "SearchFilter.c" +#line 2739 "SearchFilter.c" } #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp69_) { #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala" continue; -#line 2741 "SearchFilter.c" +#line 2745 "SearchFilter.c" } #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp74_ = tags_size; #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp74_ > 0) { -#line 2747 "SearchFilter.c" +#line 2751 "SearchFilter.c" gboolean found = FALSE; gboolean _tmp90_ = FALSE; #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala" found = FALSE; -#line 2752 "SearchFilter.c" +#line 2756 "SearchFilter.c" { gint ctr = 0; #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" ctr = 0; -#line 2757 "SearchFilter.c" +#line 2761 "SearchFilter.c" { gboolean _tmp75_ = FALSE; #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp75_ = TRUE; #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" while (TRUE) { -#line 2764 "SearchFilter.c" +#line 2768 "SearchFilter.c" gint _tmp77_ = 0; gint _tmp78_ = 0; const gchar* tag_keywords = NULL; @@ -2774,13 +2778,13 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat const gchar* _tmp86_ = NULL; #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!_tmp75_) { -#line 2778 "SearchFilter.c" +#line 2782 "SearchFilter.c" gint _tmp76_ = 0; #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp76_ = ctr; #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" ctr = _tmp76_ + 1; -#line 2784 "SearchFilter.c" +#line 2788 "SearchFilter.c" } #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp75_ = FALSE; @@ -2792,7 +2796,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat if (!(_tmp77_ < _tmp78_)) { #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 2796 "SearchFilter.c" +#line 2800 "SearchFilter.c" } #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp79_ = tags; @@ -2814,7 +2818,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp86_ = tag_keywords; #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp86_ != NULL) { -#line 2818 "SearchFilter.c" +#line 2822 "SearchFilter.c" const gchar* _tmp87_ = NULL; const gchar* _tmp88_ = NULL; gboolean _tmp89_ = FALSE; @@ -2826,11 +2830,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _tmp89_ = string_contains (_tmp87_, _tmp88_); #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp85_ = _tmp89_; -#line 2830 "SearchFilter.c" +#line 2834 "SearchFilter.c" } else { #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp85_ = FALSE; -#line 2834 "SearchFilter.c" +#line 2838 "SearchFilter.c" } #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp85_) { @@ -2838,7 +2842,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat found = TRUE; #line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 2842 "SearchFilter.c" +#line 2846 "SearchFilter.c" } } } @@ -2849,7 +2853,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat if (_tmp90_) { #line 249 "/home/jens/Source/shotwell/src/SearchFilter.vala" continue; -#line 2853 "SearchFilter.c" +#line 2857 "SearchFilter.c" } } #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -2862,7 +2866,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2866 "SearchFilter.c" +#line 2870 "SearchFilter.c" } } } @@ -2870,27 +2874,27 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (tags); #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (event); -#line 2874 "SearchFilter.c" +#line 2878 "SearchFilter.c" } #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp92_ = criteria; #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp92_) != 0) { -#line 2880 "SearchFilter.c" +#line 2884 "SearchFilter.c" gboolean _tmp93_ = FALSE; #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp93_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp91_ = _tmp93_; -#line 2886 "SearchFilter.c" +#line 2890 "SearchFilter.c" } else { #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp91_ = FALSE; -#line 2890 "SearchFilter.c" +#line 2894 "SearchFilter.c" } #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp91_) { -#line 2894 "SearchFilter.c" +#line 2898 "SearchFilter.c" SavedSearch* _tmp94_ = NULL; SavedSearch* _tmp95_ = NULL; MediaSource* _tmp96_ = NULL; @@ -2909,7 +2913,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2913 "SearchFilter.c" +#line 2917 "SearchFilter.c" } #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = TRUE; @@ -2917,7 +2921,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat _g_object_unref0 (source); #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2921 "SearchFilter.c" +#line 2925 "SearchFilter.c" } @@ -2927,7 +2931,7 @@ DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type self = (DefaultSearchViewFilter*) search_view_filter_construct (object_type); #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 2931 "SearchFilter.c" +#line 2935 "SearchFilter.c" } @@ -2936,7 +2940,7 @@ static void default_search_view_filter_class_init (DefaultSearchViewFilterClass default_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((ViewFilterClass *) klass)->predicate = default_search_view_filter_real_predicate; -#line 2940 "SearchFilter.c" +#line 2944 "SearchFilter.c" } @@ -2967,7 +2971,7 @@ static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView* result = TRUE; #line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2971 "SearchFilter.c" +#line 2975 "SearchFilter.c" } @@ -2980,7 +2984,7 @@ static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) { result = (guint) SEARCH_FILTER_CRITERIA_RATING; #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 2984 "SearchFilter.c" +#line 2988 "SearchFilter.c" } @@ -2990,14 +2994,14 @@ DisabledViewFilter* disabled_view_filter_construct (GType object_type) { self = (DisabledViewFilter*) search_view_filter_construct (object_type); #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 2994 "SearchFilter.c" +#line 2998 "SearchFilter.c" } DisabledViewFilter* disabled_view_filter_new (void) { #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala" return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER); -#line 3001 "SearchFilter.c" +#line 3005 "SearchFilter.c" } @@ -3008,7 +3012,7 @@ static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) { ((ViewFilterClass *) klass)->predicate = disabled_view_filter_real_predicate; #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala" ((SearchViewFilterClass *) klass)->get_criteria = disabled_view_filter_real_get_criteria; -#line 3012 "SearchFilter.c" +#line 3016 "SearchFilter.c" } @@ -3044,14 +3048,14 @@ TextAction* text_action_construct (GType object_type, const gchar* init) { self->priv->text = _tmp1_; #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 3048 "SearchFilter.c" +#line 3052 "SearchFilter.c" } TextAction* text_action_new (const gchar* init) { #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala" return text_action_construct (TYPE_TEXT_ACTION, init); -#line 3055 "SearchFilter.c" +#line 3059 "SearchFilter.c" } @@ -3066,7 +3070,7 @@ void text_action_set_text (TextAction* self, const gchar* text) { _tmp1_ = text; #line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (g_strcmp0 (_tmp0_, _tmp1_) != 0) { -#line 3070 "SearchFilter.c" +#line 3074 "SearchFilter.c" const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; @@ -3082,7 +3086,7 @@ void text_action_set_text (TextAction* self, const gchar* text) { _tmp4_ = text; #line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "text-changed", _tmp4_); -#line 3086 "SearchFilter.c" +#line 3090 "SearchFilter.c" } } @@ -3092,7 +3096,7 @@ void text_action_clear (TextAction* self) { g_return_if_fail (IS_TEXT_ACTION (self)); #line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_set_text (self, NULL); -#line 3096 "SearchFilter.c" +#line 3100 "SearchFilter.c" } @@ -3107,7 +3111,7 @@ gboolean text_action_is_sensitive (TextAction* self) { result = _tmp0_; #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3111 "SearchFilter.c" +#line 3115 "SearchFilter.c" } @@ -3122,7 +3126,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) { _tmp1_ = sensitive; #line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp0_ != _tmp1_) { -#line 3126 "SearchFilter.c" +#line 3130 "SearchFilter.c" gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; #line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3133,7 +3137,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) { _tmp3_ = sensitive; #line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "sensitivity-changed", _tmp3_); -#line 3137 "SearchFilter.c" +#line 3141 "SearchFilter.c" } } @@ -3149,7 +3153,7 @@ gboolean text_action_is_visible (TextAction* self) { result = _tmp0_; #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3153 "SearchFilter.c" +#line 3157 "SearchFilter.c" } @@ -3164,7 +3168,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) { _tmp1_ = visible; #line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp0_ != _tmp1_) { -#line 3168 "SearchFilter.c" +#line 3172 "SearchFilter.c" gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; #line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3175,7 +3179,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) { _tmp3_ = visible; #line 327 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "visibility-changed", _tmp3_); -#line 3179 "SearchFilter.c" +#line 3183 "SearchFilter.c" } } @@ -3191,14 +3195,14 @@ const gchar* text_action_get_value (TextAction* self) { result = _tmp0_; #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3195 "SearchFilter.c" +#line 3199 "SearchFilter.c" } static void value_text_action_init (GValue* value) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3202 "SearchFilter.c" +#line 3206 "SearchFilter.c" } @@ -3207,7 +3211,7 @@ static void value_text_action_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_unref (value->data[0].v_pointer); -#line 3211 "SearchFilter.c" +#line 3215 "SearchFilter.c" } } @@ -3217,11 +3221,11 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_ if (src_value->data[0].v_pointer) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer); -#line 3221 "SearchFilter.c" +#line 3225 "SearchFilter.c" } else { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = NULL; -#line 3225 "SearchFilter.c" +#line 3229 "SearchFilter.c" } } @@ -3229,37 +3233,37 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_ static gpointer value_text_action_peek_pointer (const GValue* value) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 3233 "SearchFilter.c" +#line 3237 "SearchFilter.c" } static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (collect_values[0].v_pointer) { -#line 3240 "SearchFilter.c" +#line 3244 "SearchFilter.c" TextAction* object; object = collect_values[0].v_pointer; #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (object->parent_instance.g_class == NULL) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3247 "SearchFilter.c" +#line 3251 "SearchFilter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.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 3251 "SearchFilter.c" +#line 3255 "SearchFilter.c" } #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = text_action_ref (object); -#line 3255 "SearchFilter.c" +#line 3259 "SearchFilter.c" } else { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3259 "SearchFilter.c" +#line 3263 "SearchFilter.c" } #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 3263 "SearchFilter.c" +#line 3267 "SearchFilter.c" } @@ -3270,25 +3274,25 @@ static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collec if (!object_p) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3274 "SearchFilter.c" +#line 3278 "SearchFilter.c" } #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!value->data[0].v_pointer) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = NULL; -#line 3280 "SearchFilter.c" +#line 3284 "SearchFilter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = value->data[0].v_pointer; -#line 3284 "SearchFilter.c" +#line 3288 "SearchFilter.c" } else { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = text_action_ref (value->data[0].v_pointer); -#line 3288 "SearchFilter.c" +#line 3292 "SearchFilter.c" } #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 3292 "SearchFilter.c" +#line 3296 "SearchFilter.c" } @@ -3302,7 +3306,7 @@ GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const G_PARAM_SPEC (spec)->value_type = object_type; #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return G_PARAM_SPEC (spec); -#line 3306 "SearchFilter.c" +#line 3310 "SearchFilter.c" } @@ -3311,7 +3315,7 @@ gpointer value_get_text_action (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL); #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 3315 "SearchFilter.c" +#line 3319 "SearchFilter.c" } @@ -3331,17 +3335,17 @@ void value_set_text_action (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_ref (value->data[0].v_pointer); -#line 3335 "SearchFilter.c" +#line 3339 "SearchFilter.c" } else { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3339 "SearchFilter.c" +#line 3343 "SearchFilter.c" } #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_unref (old); -#line 3345 "SearchFilter.c" +#line 3349 "SearchFilter.c" } } @@ -3360,17 +3364,17 @@ void value_take_text_action (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 3364 "SearchFilter.c" +#line 3368 "SearchFilter.c" } else { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 3368 "SearchFilter.c" +#line 3372 "SearchFilter.c" } #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_unref (old); -#line 3374 "SearchFilter.c" +#line 3378 "SearchFilter.c" } } @@ -3388,7 +3392,7 @@ static void text_action_class_init (TextActionClass * klass) { g_signal_new ("sensitivity_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_new ("visibility_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 3392 "SearchFilter.c" +#line 3396 "SearchFilter.c" } @@ -3403,7 +3407,7 @@ static void text_action_instance_init (TextAction * self) { self->priv->visible = TRUE; #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->ref_count = 1; -#line 3407 "SearchFilter.c" +#line 3411 "SearchFilter.c" } @@ -3415,7 +3419,7 @@ static void text_action_finalize (TextAction* obj) { g_signal_handlers_destroy (self); #line 284 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_free0 (self->priv->text); -#line 3419 "SearchFilter.c" +#line 3423 "SearchFilter.c" } @@ -3440,7 +3444,7 @@ gpointer text_action_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" return instance; -#line 3444 "SearchFilter.c" +#line 3448 "SearchFilter.c" } @@ -3453,7 +3457,7 @@ void text_action_unref (gpointer instance) { TEXT_ACTION_GET_CLASS (self)->finalize (self); #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3457 "SearchFilter.c" +#line 3461 "SearchFilter.c" } } @@ -3461,56 +3465,56 @@ void text_action_unref (gpointer instance) { static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter); -#line 3465 "SearchFilter.c" +#line 3469 "SearchFilter.c" } static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value); -#line 3472 "SearchFilter.c" +#line 3476 "SearchFilter.c" } static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter); -#line 3479 "SearchFilter.c" +#line 3483 "SearchFilter.c" } static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value); -#line 3486 "SearchFilter.c" +#line 3490 "SearchFilter.c" } static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value); -#line 3493 "SearchFilter.c" +#line 3497 "SearchFilter.c" } static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value); -#line 3500 "SearchFilter.c" +#line 3504 "SearchFilter.c" } static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value); -#line 3507 "SearchFilter.c" +#line 3511 "SearchFilter.c" } static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) { #line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text); -#line 3514 "SearchFilter.c" +#line 3518 "SearchFilter.c" } @@ -3530,14 +3534,14 @@ SearchFilterActions* search_filter_actions_construct (GType object_type) { g_signal_connect (_tmp1_, "text-changed", (GCallback) _search_filter_actions_on_text_changed_text_action_text_changed, self); #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 3534 "SearchFilter.c" +#line 3538 "SearchFilter.c" } SearchFilterActions* search_filter_actions_new (void) { #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS); -#line 3541 "SearchFilter.c" +#line 3545 "SearchFilter.c" } @@ -3552,7 +3556,7 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se result = _tmp0_; #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3556 "SearchFilter.c" +#line 3560 "SearchFilter.c" } @@ -3570,13 +3574,13 @@ GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* if (result_length1) { #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala" *result_length1 = _tmp0__length1; -#line 3574 "SearchFilter.c" +#line 3578 "SearchFilter.c" } #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3580 "SearchFilter.c" +#line 3584 "SearchFilter.c" } @@ -3598,7 +3602,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons if (_tmp1_ == NULL) { #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp0_); -#line 3602 "SearchFilter.c" +#line 3606 "SearchFilter.c" } #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala" lw = _tmp1_; @@ -3606,7 +3610,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons _tmp2_ = lw; #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp2_ != NULL) { -#line 3610 "SearchFilter.c" +#line 3614 "SearchFilter.c" LibraryWindow* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; GAction* _tmp5_ = NULL; @@ -3622,7 +3626,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons _g_object_unref0 (lw); #line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3626 "SearchFilter.c" +#line 3630 "SearchFilter.c" } #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = NULL; @@ -3630,7 +3634,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons _g_object_unref0 (lw); #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 3634 "SearchFilter.c" +#line 3638 "SearchFilter.c" } @@ -3656,7 +3660,7 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons _tmp3_ = action; #line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp3_ != NULL) { -#line 3660 "SearchFilter.c" +#line 3664 "SearchFilter.c" GSimpleAction* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3665,92 +3669,140 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons _tmp5_ = sensitive; #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_simple_action_set_enabled (_tmp4_, _tmp5_); -#line 3669 "SearchFilter.c" +#line 3673 "SearchFilter.c" } #line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (action); -#line 3673 "SearchFilter.c" +#line 3677 "SearchFilter.c" +} + + +static GVariant* _variant_new32 (gboolean value) { +#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 3684 "SearchFilter.c" } -static GVariant* _variant_new28 (gchar* value) { +static GVariant* _variant_new33 (gboolean value) { +#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 3691 "SearchFilter.c" +} + + +static GVariant* _variant_new34 (gboolean value) { +#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 3698 "SearchFilter.c" +} + + +static GVariant* _variant_new35 (gboolean value) { +#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 3705 "SearchFilter.c" +} + + +static GVariant* _variant_new36 (gchar* value) { #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 3680 "SearchFilter.c" +#line 3712 "SearchFilter.c" } void search_filter_actions_reset (SearchFilterActions* self) { GSimpleAction* _tmp0_ = NULL; GSimpleAction* _tmp1_ = NULL; - GSimpleAction* _tmp2_ = NULL; + GVariant* _tmp2_ = NULL; GSimpleAction* _tmp3_ = NULL; GSimpleAction* _tmp4_ = NULL; - GSimpleAction* _tmp5_ = NULL; + GVariant* _tmp5_ = NULL; GSimpleAction* _tmp6_ = NULL; GSimpleAction* _tmp7_ = NULL; - GVariant* v = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - GVariant* _tmp10_ = NULL; + GVariant* _tmp8_ = NULL; + GSimpleAction* _tmp9_ = NULL; + GSimpleAction* _tmp10_ = NULL; GVariant* _tmp11_ = NULL; - GSimpleAction* _tmp12_ = NULL; - GSimpleAction* _tmp13_ = NULL; - TextAction* _tmp14_ = NULL; - TextAction* _tmp15_ = NULL; + GVariant* v = NULL; + gchar* _tmp12_ = NULL; + gchar* _tmp13_ = NULL; + GVariant* _tmp14_ = NULL; + GVariant* _tmp15_ = NULL; + GSimpleAction* _tmp16_ = NULL; + GSimpleAction* _tmp17_ = NULL; + TextAction* _tmp18_ = NULL; + TextAction* _tmp19_ = NULL; #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = search_filter_actions_get_rating (self); + _tmp0_ = search_filter_actions_get_flagged (self); #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _tmp0_; #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_enabled (_tmp1_, FALSE); + _tmp2_ = _variant_new32 (FALSE); +#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit_by_name (_tmp1_, "change-state", _tmp2_); +#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_variant_unref0 (_tmp2_); #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = search_filter_actions_get_photos (self); + _tmp3_ = search_filter_actions_get_photos (self); #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = _tmp2_; + _tmp4_ = _tmp3_; +#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = _variant_new33 (FALSE); #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_enabled (_tmp3_, FALSE); + g_signal_emit_by_name (_tmp4_, "change-state", _tmp5_); +#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_variant_unref0 (_tmp5_); +#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = search_filter_actions_get_raw (self); #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = search_filter_actions_get_raw (self); + _tmp7_ = _tmp6_; #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = _tmp4_; + _tmp8_ = _variant_new34 (FALSE); #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_enabled (_tmp5_, FALSE); + g_signal_emit_by_name (_tmp7_, "change-state", _tmp8_); +#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_variant_unref0 (_tmp8_); #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = search_filter_actions_get_videos (self); + _tmp9_ = search_filter_actions_get_videos (self); #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = _tmp6_; + _tmp10_ = _tmp9_; #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_enabled (_tmp7_, FALSE); + _tmp11_ = _variant_new35 (FALSE); +#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit_by_name (_tmp10_, "change-state", _tmp11_); +#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_variant_unref0 (_tmp11_); #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = g_strdup_printf ("'%d'", (gint) RATING_FILTER_UNRATED_OR_HIGHER); + _tmp12_ = g_strdup_printf ("%d", (gint) RATING_FILTER_UNRATED_OR_HIGHER); #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = _tmp8_; + _tmp13_ = _tmp12_; #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp10_ = _variant_new28 (_tmp9_); + _tmp14_ = _variant_new36 (_tmp13_); #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp11_ = _tmp10_; + _tmp15_ = _tmp14_; #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp13_); #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala" - v = _tmp11_; + v = _tmp15_; #line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp12_ = search_filter_actions_get_rating (self); + _tmp16_ = search_filter_actions_get_rating (self); #line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp13_ = _tmp12_; + _tmp17_ = _tmp16_; #line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp13_, v); + g_signal_emit_by_name (_tmp17_, "change-state", v); #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp14_ = search_filter_actions_get_text (self); + _tmp18_ = search_filter_actions_get_text (self); #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp15_ = _tmp14_; + _tmp19_ = _tmp18_; #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala" - text_action_set_text (_tmp15_, NULL); + text_action_set_text (_tmp19_, NULL); #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (v); -#line 3754 "SearchFilter.c" +#line 3806 "SearchFilter.c" } @@ -3766,21 +3818,21 @@ void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterAction search_filter_actions_update_sensitivities (self); #line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "criteria-changed"); -#line 3770 "SearchFilter.c" +#line 3822 "SearchFilter.c" } static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) { #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender); -#line 3777 "SearchFilter.c" +#line 3829 "SearchFilter.c" } static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) { #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender); -#line 3784 "SearchFilter.c" +#line 3836 "SearchFilter.c" } @@ -3809,7 +3861,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _tmp2_ = old_tracked_page; #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp2_ != NULL) { -#line 3813 "SearchFilter.c" +#line 3865 "SearchFilter.c" CoreViewTracker* tracker = NULL; CheckerboardPage* _tmp3_ = NULL; CoreViewTracker* _tmp4_ = NULL; @@ -3824,7 +3876,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _tmp5_ = tracker; #line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) { -#line 3828 "SearchFilter.c" +#line 3880 "SearchFilter.c" CoreViewTracker* _tmp6_ = NULL; guint _tmp7_ = 0U; #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3833,14 +3885,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE); #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self); -#line 3837 "SearchFilter.c" +#line 3889 "SearchFilter.c" } else { CoreViewTracker* _tmp8_ = NULL; #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = tracker; #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) { -#line 3844 "SearchFilter.c" +#line 3896 "SearchFilter.c" CoreViewTracker* _tmp9_ = NULL; guint _tmp10_ = 0U; #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3849,12 +3901,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE); #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self); -#line 3853 "SearchFilter.c" +#line 3905 "SearchFilter.c" } } #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 3858 "SearchFilter.c" +#line 3910 "SearchFilter.c" } #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = new_page; @@ -3866,7 +3918,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _tmp13_ = new_tracked_page; #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp13_ != NULL) { -#line 3870 "SearchFilter.c" +#line 3922 "SearchFilter.c" CoreViewTracker* tracker = NULL; CheckerboardPage* _tmp14_ = NULL; CoreViewTracker* _tmp15_ = NULL; @@ -3883,7 +3935,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _tmp16_ = tracker; #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) { -#line 3887 "SearchFilter.c" +#line 3939 "SearchFilter.c" CoreViewTracker* _tmp17_ = NULL; CoreViewTracker* _tmp18_ = NULL; #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3902,14 +3954,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _g_object_unref0 (old_tracked_page); #line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 3906 "SearchFilter.c" +#line 3958 "SearchFilter.c" } else { CoreViewTracker* _tmp19_ = NULL; #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp19_ = tracker; #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) { -#line 3913 "SearchFilter.c" +#line 3965 "SearchFilter.c" CoreViewTracker* _tmp20_ = NULL; CoreViewTracker* _tmp21_ = NULL; #line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -3928,12 +3980,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _g_object_unref0 (old_tracked_page); #line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 3932 "SearchFilter.c" +#line 3984 "SearchFilter.c" } } #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 3937 "SearchFilter.c" +#line 3989 "SearchFilter.c" } #line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->has_flagged = FALSE; @@ -3951,14 +4003,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag _g_object_unref0 (new_tracked_page); #line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (old_tracked_page); -#line 3955 "SearchFilter.c" +#line 4007 "SearchFilter.c" } static gpointer _core_tracker_ref0 (gpointer self) { #line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? core_tracker_ref (self) : NULL; -#line 3962 "SearchFilter.c" +#line 4014 "SearchFilter.c" } @@ -4012,7 +4064,7 @@ static void search_filter_actions_on_media_tracker_updated (SearchFilterActions* search_filter_actions_update_sensitivities (self); #line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 4016 "SearchFilter.c" +#line 4068 "SearchFilter.c" } @@ -4069,7 +4121,7 @@ static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions search_filter_actions_update_sensitivities (self); #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala" _core_tracker_unref0 (tracker); -#line 4073 "SearchFilter.c" +#line 4125 "SearchFilter.c" } @@ -4109,7 +4161,7 @@ static void search_filter_actions_update_sensitivities (SearchFilterActions* sel _tmp7_ = self->priv->has_flagged; #line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "media-context-changed", _tmp4_, _tmp5_, _tmp6_, _tmp7_); -#line 4113 "SearchFilter.c" +#line 4165 "SearchFilter.c" } @@ -4123,7 +4175,7 @@ static void search_filter_actions_on_text_changed (SearchFilterActions* self, Te _tmp0_ = text; #line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "text-changed", _tmp0_); -#line 4127 "SearchFilter.c" +#line 4179 "SearchFilter.c" } @@ -4140,21 +4192,21 @@ static void search_filter_actions_on_action_radio (SearchFilterActions* self, GS _tmp1_ = parameter; #line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_); -#line 4144 "SearchFilter.c" +#line 4196 "SearchFilter.c" } -static gboolean _variant_get29 (GVariant* value) { +static gboolean _variant_get37 (GVariant* value) { #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_get_boolean (value); -#line 4151 "SearchFilter.c" +#line 4203 "SearchFilter.c" } -static GVariant* _variant_new30 (gboolean value) { +static GVariant* _variant_new38 (gboolean value) { #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4158 "SearchFilter.c" +#line 4210 "SearchFilter.c" } @@ -4178,7 +4230,7 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _tmp1_; #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = _variant_get29 (_tmp2_); + _tmp3_ = _variant_get37 (_tmp2_); #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = _tmp3_; #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4188,12 +4240,12 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = action; #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = _variant_new30 (!state); + _tmp6_ = _variant_new38 (!state); #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_); #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (_tmp6_); -#line 4197 "SearchFilter.c" +#line 4249 "SearchFilter.c" } @@ -4207,17 +4259,25 @@ static void search_filter_actions_register (SearchFilterActions* self) { _text_action_unref0 (self->priv->_text); #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_text = _tmp0_; -#line 4211 "SearchFilter.c" +#line 4263 "SearchFilter.c" } static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value) { - GSimpleAction* _tmp0_ = NULL; - GVariant* _tmp1_ = NULL; + GVariant* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; + GSimpleAction* _tmp2_ = NULL; + GVariant* _tmp3_ = NULL; + GVariant* _tmp4_ = NULL; + const gchar* _tmp5_ = NULL; + gboolean _tmp6_ = FALSE; RatingFilter filter = 0; - GVariant* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; + GVariant* _tmp7_ = NULL; + const gchar* _tmp8_ = NULL; + gint _tmp9_ = 0; + GSimpleAction* _tmp10_ = NULL; + GVariant* _tmp11_ = NULL; + RatingFilter _tmp12_ = 0; #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -4225,22 +4285,46 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self, #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp0_ = action; + _tmp0_ = value; #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = value; + _tmp1_ = g_variant_get_string (_tmp0_, NULL); #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp0_, _tmp1_); -#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = value; -#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = g_variant_get_string (_tmp2_, NULL); -#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = atoi (_tmp3_); + _tmp2_ = action; +#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp3_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_get_type (), GAction)); +#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp4_ = _tmp3_; +#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp5_ = g_variant_get_string (_tmp4_, NULL); +#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0; +#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _g_variant_unref0 (_tmp4_); +#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala" + if (_tmp6_) { #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala" - filter = (RatingFilter) _tmp4_; -#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_signal_emit_by_name (self, "rating-changed", filter); -#line 4244 "SearchFilter.c" + return; +#line 4308 "SearchFilter.c" + } +#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp7_ = value; +#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp8_ = g_variant_get_string (_tmp7_, NULL); +#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp9_ = atoi (_tmp8_); +#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala" + filter = (RatingFilter) _tmp9_; +#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp10_ = action; +#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp11_ = value; +#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_simple_action_set_state (_tmp10_, _tmp11_); +#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala" + _tmp12_ = filter; +#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala" + g_signal_emit_by_name (self, "rating-changed", _tmp12_); +#line 4328 "SearchFilter.c" } @@ -4249,25 +4333,25 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GVariant* _tmp1_ = NULL; GVariant* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); -#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); -#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = action; -#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = value; -#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_simple_action_set_state (_tmp0_, _tmp1_); -#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = value; -#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = g_variant_get_boolean (_tmp2_); -#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "flagged-toggled", _tmp3_); -#line 4271 "SearchFilter.c" +#line 4355 "SearchFilter.c" } @@ -4276,25 +4360,25 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GVariant* _tmp1_ = NULL; GVariant* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); -#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); -#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = action; -#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = value; -#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_simple_action_set_state (_tmp0_, _tmp1_); -#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = value; -#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = g_variant_get_boolean (_tmp2_); -#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "photos-toggled", _tmp3_); -#line 4298 "SearchFilter.c" +#line 4382 "SearchFilter.c" } @@ -4303,25 +4387,25 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GVariant* _tmp1_ = NULL; GVariant* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); -#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); -#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = action; -#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = value; -#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_simple_action_set_state (_tmp0_, _tmp1_); -#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = value; -#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = g_variant_get_boolean (_tmp2_); -#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "videos-toggled", _tmp3_); -#line 4325 "SearchFilter.c" +#line 4409 "SearchFilter.c" } @@ -4330,85 +4414,85 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi GVariant* _tmp1_ = NULL; GVariant* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self)); -#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (value != NULL); -#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = action; -#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = value; -#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_simple_action_set_state (_tmp0_, _tmp1_); -#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = value; -#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = g_variant_get_boolean (_tmp2_); -#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "raw-toggled", _tmp3_); -#line 4352 "SearchFilter.c" +#line 4436 "SearchFilter.c" } gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE); -#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->has_photos; -#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; -#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4367 "SearchFilter.c" +#line 4451 "SearchFilter.c" } gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE); -#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->has_videos; -#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; -#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4382 "SearchFilter.c" +#line 4466 "SearchFilter.c" } gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 597 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE); -#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->has_raw; -#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; -#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4397 "SearchFilter.c" +#line 4481 "SearchFilter.c" } gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 601 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE); -#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->has_flagged; -#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = _tmp0_; -#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4412 "SearchFilter.c" +#line 4496 "SearchFilter.c" } @@ -4423,7 +4507,7 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) { result = _tmp0_; #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4427 "SearchFilter.c" +#line 4511 "SearchFilter.c" } @@ -4438,7 +4522,7 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) { result = _tmp0_; #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4442 "SearchFilter.c" +#line 4526 "SearchFilter.c" } @@ -4453,7 +4537,7 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) { result = _tmp0_; #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4457 "SearchFilter.c" +#line 4541 "SearchFilter.c" } @@ -4468,7 +4552,7 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) { result = _tmp0_; #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4472 "SearchFilter.c" +#line 4556 "SearchFilter.c" } @@ -4483,7 +4567,7 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) { result = _tmp0_; #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4487 "SearchFilter.c" +#line 4571 "SearchFilter.c" } @@ -4503,7 +4587,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) { result = _tmp1_; #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4507 "SearchFilter.c" +#line 4591 "SearchFilter.c" } @@ -4522,26 +4606,26 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos data1 = closure->data; #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" data2 = param_values->data[0].v_pointer; -#line 4526 "SearchFilter.c" +#line 4610 "SearchFilter.c" } else { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" data1 = param_values->data[0].v_pointer; #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" data2 = closure->data; -#line 4532 "SearchFilter.c" +#line 4616 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_boolean (param_values + 4), data2); -#line 4538 "SearchFilter.c" +#line 4622 "SearchFilter.c" } static void value_search_filter_actions_init (GValue* value) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4545 "SearchFilter.c" +#line 4629 "SearchFilter.c" } @@ -4550,7 +4634,7 @@ static void value_search_filter_actions_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_unref (value->data[0].v_pointer); -#line 4554 "SearchFilter.c" +#line 4638 "SearchFilter.c" } } @@ -4560,11 +4644,11 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa if (src_value->data[0].v_pointer) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer); -#line 4564 "SearchFilter.c" +#line 4648 "SearchFilter.c" } else { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = NULL; -#line 4568 "SearchFilter.c" +#line 4652 "SearchFilter.c" } } @@ -4572,37 +4656,37 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa static gpointer value_search_filter_actions_peek_pointer (const GValue* value) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 4576 "SearchFilter.c" +#line 4660 "SearchFilter.c" } static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (collect_values[0].v_pointer) { -#line 4583 "SearchFilter.c" +#line 4667 "SearchFilter.c" SearchFilterActions* object; object = collect_values[0].v_pointer; #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (object->parent_instance.g_class == NULL) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4590 "SearchFilter.c" +#line 4674 "SearchFilter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.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 4594 "SearchFilter.c" +#line 4678 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = search_filter_actions_ref (object); -#line 4598 "SearchFilter.c" +#line 4682 "SearchFilter.c" } else { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4602 "SearchFilter.c" +#line 4686 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 4606 "SearchFilter.c" +#line 4690 "SearchFilter.c" } @@ -4613,25 +4697,25 @@ static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guin if (!object_p) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4617 "SearchFilter.c" +#line 4701 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!value->data[0].v_pointer) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = NULL; -#line 4623 "SearchFilter.c" +#line 4707 "SearchFilter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = value->data[0].v_pointer; -#line 4627 "SearchFilter.c" +#line 4711 "SearchFilter.c" } else { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = search_filter_actions_ref (value->data[0].v_pointer); -#line 4631 "SearchFilter.c" +#line 4715 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 4635 "SearchFilter.c" +#line 4719 "SearchFilter.c" } @@ -4645,7 +4729,7 @@ GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* ni G_PARAM_SPEC (spec)->value_type = object_type; #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return G_PARAM_SPEC (spec); -#line 4649 "SearchFilter.c" +#line 4733 "SearchFilter.c" } @@ -4654,7 +4738,7 @@ gpointer value_get_search_filter_actions (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS), NULL); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 4658 "SearchFilter.c" +#line 4742 "SearchFilter.c" } @@ -4674,17 +4758,17 @@ void value_set_search_filter_actions (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_ref (value->data[0].v_pointer); -#line 4678 "SearchFilter.c" +#line 4762 "SearchFilter.c" } else { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4682 "SearchFilter.c" +#line 4766 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_unref (old); -#line 4688 "SearchFilter.c" +#line 4772 "SearchFilter.c" } } @@ -4703,17 +4787,17 @@ void value_take_search_filter_actions (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 4707 "SearchFilter.c" +#line 4791 "SearchFilter.c" } else { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 4711 "SearchFilter.c" +#line 4795 "SearchFilter.c" } #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_actions_unref (old); -#line 4717 "SearchFilter.c" +#line 4801 "SearchFilter.c" } } @@ -4737,7 +4821,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass) g_signal_new ("rating_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_new ("text_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); -#line 4741 "SearchFilter.c" +#line 4825 "SearchFilter.c" /** * fired when the kinds of media present in the current view change (e.g., a video becomes * available in the view through a new import operation or no raw photos are available in @@ -4747,7 +4831,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass) g_signal_new ("media_context_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_new ("criteria_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4751 "SearchFilter.c" +#line 4835 "SearchFilter.c" } @@ -4770,7 +4854,7 @@ static void search_filter_actions_instance_init (SearchFilterActions * self) { self->priv->can_filter_by_stars = TRUE; #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->ref_count = 1; -#line 4774 "SearchFilter.c" +#line 4858 "SearchFilter.c" } @@ -4782,7 +4866,7 @@ static void search_filter_actions_finalize (SearchFilterActions* obj) { g_signal_handlers_destroy (self); #line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala" _text_action_unref0 (self->priv->_text); -#line 4786 "SearchFilter.c" +#line 4870 "SearchFilter.c" } @@ -4807,7 +4891,7 @@ gpointer search_filter_actions_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" return instance; -#line 4811 "SearchFilter.c" +#line 4895 "SearchFilter.c" } @@ -4820,7 +4904,7 @@ void search_filter_actions_unref (gpointer instance) { SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self); #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4824 "SearchFilter.c" +#line 4908 "SearchFilter.c" } } @@ -4828,56 +4912,56 @@ void search_filter_actions_unref (gpointer instance) { static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged, gpointer self) { #line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged); -#line 4832 "SearchFilter.c" +#line 4916 "SearchFilter.c" } static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { #line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self); -#line 4839 "SearchFilter.c" +#line 4923 "SearchFilter.c" } static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { #line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self); -#line 4846 "SearchFilter.c" +#line 4930 "SearchFilter.c" } static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { #line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self); -#line 4853 "SearchFilter.c" +#line 4937 "SearchFilter.c" } static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) { #line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self); -#line 4860 "SearchFilter.c" +#line 4944 "SearchFilter.c" } static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) { #line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self); -#line 4867 "SearchFilter.c" +#line 4951 "SearchFilter.c" } static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) { #line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self); -#line 4874 "SearchFilter.c" +#line 4958 "SearchFilter.c" } static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) { #line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self); -#line 4881 "SearchFilter.c" +#line 4965 "SearchFilter.c" } @@ -4886,28 +4970,28 @@ static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_pop result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number); #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 4890 "SearchFilter.c" +#line 4974 "SearchFilter.c" } static gpointer _search_filter_actions_ref0 (gpointer self) { #line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? search_filter_actions_ref (self) : NULL; -#line 4897 "SearchFilter.c" +#line 4981 "SearchFilter.c" } static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self); -#line 4904 "SearchFilter.c" +#line 4988 "SearchFilter.c" } static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self) { #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self); -#line 4911 "SearchFilter.c" +#line 4995 "SearchFilter.c" } @@ -5051,7 +5135,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF _tmp9_ = self->priv->toolbar; #line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR); -#line 5055 "SearchFilter.c" +#line 5139 "SearchFilter.c" { GtkBuilder* _tmp10_ = NULL; #line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -5060,12 +5144,12 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF gtk_builder_add_from_resource (_tmp10_, "/org/gnome/Shotwell/search_bar.ui", &_inner_error_); #line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5064 "SearchFilter.c" - goto __catch590_g_error; +#line 5148 "SearchFilter.c" + goto __catch588_g_error; } } - goto __finally590; - __catch590_g_error: + goto __finally588; + __catch588_g_error: { GError* err = NULL; const gchar* _tmp11_ = NULL; @@ -5093,9 +5177,9 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF _g_free0 (_tmp15_); #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_error_free0 (err); -#line 5097 "SearchFilter.c" +#line 5181 "SearchFilter.c" } - __finally590: + __finally588: #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -5104,7 +5188,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF g_clear_error (&_inner_error_); #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 5108 "SearchFilter.c" +#line 5192 "SearchFilter.c" } #line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp16_ = self->priv->close_item; @@ -5408,14 +5492,14 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF _g_object_unref0 (model); #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 5412 "SearchFilter.c" +#line 5496 "SearchFilter.c" } SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) { #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions); -#line 5419 "SearchFilter.c" +#line 5503 "SearchFilter.c" } @@ -5430,77 +5514,77 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar* _tmp0_ = has_photos; #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp0_) { -#line 5434 "SearchFilter.c" +#line 5518 "SearchFilter.c" SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL; #line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->priv->toolbtn_photos; #line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS); -#line 5440 "SearchFilter.c" +#line 5524 "SearchFilter.c" } else { SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL; #line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->toolbtn_photos; #line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED); -#line 5447 "SearchFilter.c" +#line 5531 "SearchFilter.c" } #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = has_videos; #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp3_) { -#line 5453 "SearchFilter.c" +#line 5537 "SearchFilter.c" SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL; #line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->toolbtn_videos; #line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS); -#line 5459 "SearchFilter.c" +#line 5543 "SearchFilter.c" } else { SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL; #line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->toolbtn_videos; #line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED); -#line 5466 "SearchFilter.c" +#line 5550 "SearchFilter.c" } #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = has_raw; #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp6_) { -#line 5472 "SearchFilter.c" +#line 5556 "SearchFilter.c" SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL; #line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = self->priv->toolbtn_raw; #line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW); -#line 5478 "SearchFilter.c" +#line 5562 "SearchFilter.c" } else { SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL; #line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = self->priv->toolbtn_raw; #line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED); -#line 5485 "SearchFilter.c" +#line 5569 "SearchFilter.c" } #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = has_flagged; #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp9_) { -#line 5491 "SearchFilter.c" +#line 5575 "SearchFilter.c" SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL; #line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = self->priv->toolbtn_flag; #line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED); -#line 5497 "SearchFilter.c" +#line 5581 "SearchFilter.c" } else { SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL; #line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = self->priv->toolbtn_flag; #line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED); -#line 5504 "SearchFilter.c" +#line 5588 "SearchFilter.c" } } @@ -5524,14 +5608,14 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo result = FALSE; #line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 5528 "SearchFilter.c" +#line 5612 "SearchFilter.c" } -static GVariant* _variant_new31 (gboolean value) { +static GVariant* _variant_new39 (gboolean value) { #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5535 "SearchFilter.c" +#line 5619 "SearchFilter.c" } @@ -5561,24 +5645,24 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool _tmp4_ = action; #line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp4_ != NULL) { -#line 5565 "SearchFilter.c" +#line 5649 "SearchFilter.c" GSimpleAction* _tmp5_ = NULL; GVariant* _tmp6_ = NULL; #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = action; #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = _variant_new31 (FALSE); + _tmp6_ = _variant_new39 (FALSE); #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp5_, _tmp6_); + g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_); #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (_tmp6_); -#line 5576 "SearchFilter.c" +#line 5660 "SearchFilter.c" } #line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (action); #line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (aw); -#line 5582 "SearchFilter.c" +#line 5666 "SearchFilter.c" } @@ -5587,7 +5671,7 @@ static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self) g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1220 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5591 "SearchFilter.c" +#line 5675 "SearchFilter.c" } @@ -5596,7 +5680,7 @@ static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self) g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5600 "SearchFilter.c" +#line 5684 "SearchFilter.c" } @@ -5605,7 +5689,7 @@ static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self) g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5609 "SearchFilter.c" +#line 5693 "SearchFilter.c" } @@ -5614,7 +5698,7 @@ static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) { g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5618 "SearchFilter.c" +#line 5702 "SearchFilter.c" } @@ -5623,14 +5707,14 @@ static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* s g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5627 "SearchFilter.c" +#line 5711 "SearchFilter.c" } -static GVariant* _variant_new32 (gboolean value) { +static GVariant* _variant_new40 (gboolean value) { #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5634 "SearchFilter.c" +#line 5718 "SearchFilter.c" } @@ -5657,7 +5741,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) _g_object_unref0 (aw); #line 1243 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 5661 "SearchFilter.c" +#line 5745 "SearchFilter.c" } #line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = aw; @@ -5671,18 +5755,18 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) _tmp5_ = action; #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp5_ != NULL) { -#line 5675 "SearchFilter.c" +#line 5759 "SearchFilter.c" GSimpleAction* _tmp6_ = NULL; GVariant* _tmp7_ = NULL; #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = action; #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = _variant_new32 (TRUE); + _tmp7_ = _variant_new40 (TRUE); #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_simple_action_set_state (_tmp6_, _tmp7_); + g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_); #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_variant_unref0 (_tmp7_); -#line 5686 "SearchFilter.c" +#line 5770 "SearchFilter.c" } #line 1253 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); @@ -5690,7 +5774,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self) _g_object_unref0 (action); #line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (aw); -#line 5694 "SearchFilter.c" +#line 5778 "SearchFilter.c" } @@ -5699,14 +5783,14 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self)); #line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5703 "SearchFilter.c" +#line 5787 "SearchFilter.c" } static gpointer _view_filter_ref0 (gpointer self) { #line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? view_filter_ref (self) : NULL; -#line 5710 "SearchFilter.c" +#line 5794 "SearchFilter.c" } @@ -5733,7 +5817,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie if (_tmp0_ == _tmp1_) { #line 1265 "/home/jens/Source/shotwell/src/SearchFilter.vala" return; -#line 5737 "SearchFilter.c" +#line 5821 "SearchFilter.c" } #line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = search_filter; @@ -5761,7 +5845,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & _tmp9_) != 0); #line 1273 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 5765 "SearchFilter.c" +#line 5849 "SearchFilter.c" } @@ -5778,7 +5862,7 @@ void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) { search_filter_toolbar_set_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala" _view_filter_unref0 (_tmp1_); -#line 5782 "SearchFilter.c" +#line 5866 "SearchFilter.c" } @@ -5871,7 +5955,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp0_ = self->priv->search_filter; #line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (NULL == _tmp0_) { -#line 5875 "SearchFilter.c" +#line 5959 "SearchFilter.c" LibraryWindow* _tmp1_ = NULL; LibraryWindow* _tmp2_ = NULL; #line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -5882,7 +5966,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { library_window_show_search_bar (_tmp2_, TRUE); #line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp2_); -#line 5886 "SearchFilter.c" +#line 5970 "SearchFilter.c" } #line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->search_filter; @@ -6074,7 +6158,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp73_ = _tmp72_; #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp73_) { -#line 6078 "SearchFilter.c" +#line 6162 "SearchFilter.c" SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL; gboolean _tmp75_ = FALSE; gboolean _tmp76_ = FALSE; @@ -6086,11 +6170,11 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp76_ = _tmp75_; #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp70_ = _tmp76_; -#line 6090 "SearchFilter.c" +#line 6174 "SearchFilter.c" } else { #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp70_ = FALSE; -#line 6094 "SearchFilter.c" +#line 6178 "SearchFilter.c" } #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp77_ = self->priv->sepr_mediatype_flagged; @@ -6104,7 +6188,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp82_ = _tmp81_; #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp82_) { -#line 6108 "SearchFilter.c" +#line 6192 "SearchFilter.c" SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL; gboolean _tmp84_ = FALSE; gboolean _tmp85_ = FALSE; @@ -6116,17 +6200,17 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp85_ = _tmp84_; #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp79_ = _tmp85_; -#line 6120 "SearchFilter.c" +#line 6204 "SearchFilter.c" } else { #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp79_ = FALSE; -#line 6124 "SearchFilter.c" +#line 6208 "SearchFilter.c" } #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp79_) { #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp78_ = TRUE; -#line 6130 "SearchFilter.c" +#line 6214 "SearchFilter.c" } else { gboolean _tmp86_ = FALSE; SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL; @@ -6140,7 +6224,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp89_ = _tmp88_; #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp89_) { -#line 6144 "SearchFilter.c" +#line 6228 "SearchFilter.c" SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL; gboolean _tmp91_ = FALSE; gboolean _tmp92_ = FALSE; @@ -6152,15 +6236,15 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp92_ = _tmp91_; #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp86_ = _tmp92_; -#line 6156 "SearchFilter.c" +#line 6240 "SearchFilter.c" } else { #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp86_ = FALSE; -#line 6160 "SearchFilter.c" +#line 6244 "SearchFilter.c" } #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp78_ = _tmp86_; -#line 6164 "SearchFilter.c" +#line 6248 "SearchFilter.c" } #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp93_ = self->priv->sepr_flagged_rating; @@ -6170,7 +6254,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) { _tmp94_ = self->priv->search_filter; #line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh"); -#line 6174 "SearchFilter.c" +#line 6258 "SearchFilter.c" } @@ -6191,7 +6275,7 @@ static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self->priv->saved_search = _tmp1_; #line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 6195 "SearchFilter.c" +#line 6279 "SearchFilter.c" } @@ -6204,7 +6288,7 @@ static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self self->priv->saved_search = NULL; #line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_update (self); -#line 6208 "SearchFilter.c" +#line 6292 "SearchFilter.c" } @@ -6234,7 +6318,7 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS saved_search_dialog_show (ssd); #line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala" _saved_search_dialog_unref0 (ssd); -#line 6238 "SearchFilter.c" +#line 6322 "SearchFilter.c" } @@ -6259,7 +6343,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save _tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_); #line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp3_) { -#line 6263 "SearchFilter.c" +#line 6347 "SearchFilter.c" CommandManager* _tmp4_ = NULL; CommandManager* _tmp5_ = NULL; SavedSearch* _tmp6_ = NULL; @@ -6281,7 +6365,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save _g_object_unref0 (_tmp8_); #line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala" _command_manager_unref0 (_tmp5_); -#line 6285 "SearchFilter.c" +#line 6369 "SearchFilter.c" } } @@ -6307,7 +6391,7 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) { saved_search_dialog_show (_tmp3_); #line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala" _saved_search_dialog_unref0 (_tmp3_); -#line 6311 "SearchFilter.c" +#line 6395 "SearchFilter.c" } @@ -6332,42 +6416,42 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self) _tmp3_ = _tmp2_->filter_popup; #line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_hide (_tmp3_); -#line 6336 "SearchFilter.c" +#line 6420 "SearchFilter.c" } static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) { #line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search); -#line 6343 "SearchFilter.c" +#line 6427 "SearchFilter.c" } static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) { #line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search); -#line 6350 "SearchFilter.c" +#line 6434 "SearchFilter.c" } static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) { #line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search); -#line 6357 "SearchFilter.c" +#line 6441 "SearchFilter.c" } static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) { #line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self); -#line 6364 "SearchFilter.c" +#line 6448 "SearchFilter.c" } static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) { #line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self); -#line 6371 "SearchFilter.c" +#line 6455 "SearchFilter.c" } @@ -6380,28 +6464,28 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo _tmp1_ = self->priv->elide_showing_again; #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_) { -#line 6384 "SearchFilter.c" +#line 6468 "SearchFilter.c" SavedSearch* _tmp2_ = NULL; #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->saved_search; #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = _tmp2_ == NULL; -#line 6390 "SearchFilter.c" +#line 6474 "SearchFilter.c" } else { #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = FALSE; -#line 6394 "SearchFilter.c" +#line 6478 "SearchFilter.c" } #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp0_) { -#line 6398 "SearchFilter.c" +#line 6482 "SearchFilter.c" } else { SavedSearch* _tmp3_ = NULL; #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->saved_search; #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp3_ != NULL) { -#line 6405 "SearchFilter.c" +#line 6489 "SearchFilter.c" SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL; #line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->saved_search); @@ -6413,7 +6497,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE); #line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_disable_savedsearch (self); -#line 6417 "SearchFilter.c" +#line 6501 "SearchFilter.c" } else { SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL; SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL; @@ -6438,7 +6522,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo _tmp6_ = _tmp5_->filter_popup; #line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp6_ != NULL) { -#line 6442 "SearchFilter.c" +#line 6526 "SearchFilter.c" SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL; SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL; guint _tmp9_ = 0U; @@ -6494,7 +6578,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE); #line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self); -#line 6498 "SearchFilter.c" +#line 6582 "SearchFilter.c" } #line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp22_ = self->priv->saved_search_button; @@ -6542,12 +6626,12 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo _tmp36_ = _tmp35_->filter_popup; #line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_show_all (_tmp36_); -#line 6546 "SearchFilter.c" +#line 6630 "SearchFilter.c" } } #line 1388 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->elide_showing_again = FALSE; -#line 6551 "SearchFilter.c" +#line 6635 "SearchFilter.c" } @@ -6559,7 +6643,7 @@ void search_filter_toolbar_take_focus (SearchFilterToolbar* self) { _tmp0_ = self->priv->search_box; #line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_get_focus (_tmp0_); -#line 6563 "SearchFilter.c" +#line 6647 "SearchFilter.c" } @@ -6570,110 +6654,110 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; GtkLabel* _tmp11_ = NULL; -#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (s != NULL, NULL); -#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchFilterToolbarLabelToolItem*) g_object_new (object_type, NULL); -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = s; -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_); -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp1_); -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->label); -#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->label = _tmp1_; -#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = left_padding; -#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp3_ != 0) { -#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = TRUE; -#line 6594 "SearchFilter.c" +#line 6678 "SearchFilter.c" } else { gint _tmp4_ = 0; -#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = right_padding; -#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _tmp4_ != 0; -#line 6601 "SearchFilter.c" +#line 6685 "SearchFilter.c" } -#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp2_) { -#line 6605 "SearchFilter.c" +#line 6689 "SearchFilter.c" GtkLabel* _tmp5_ = NULL; GtkLabel* _tmp6_ = NULL; GtkLabel* _tmp7_ = NULL; gint _tmp8_ = 0; GtkLabel* _tmp9_ = NULL; gint _tmp10_ = 0; -#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->label; -#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START); -#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = self->priv->label; -#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); -#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = self->priv->label; -#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp8_ = left_padding; -#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp8_); -#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp9_ = self->priv->label; -#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp10_ = right_padding; -#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_); -#line 6632 "SearchFilter.c" +#line 6716 "SearchFilter.c" } -#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp11_ = self->priv->label; -#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 6640 "SearchFilter.c" +#line 6724 "SearchFilter.c" } static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) { -#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding); -#line 6647 "SearchFilter.c" +#line 6731 "SearchFilter.c" } static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolbarLabelToolItemClass * klass) { -#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_label_tool_item_parent_class = g_type_class_peek_parent (klass); -#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate)); -#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize; -#line 6658 "SearchFilter.c" +#line 6742 "SearchFilter.c" } static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) { -#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self); -#line 6665 "SearchFilter.c" +#line 6749 "SearchFilter.c" } static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) { SearchFilterToolbarLabelToolItem * self; -#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, SearchFilterToolbarLabelToolItem); -#line 615 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->label); -#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj); -#line 6677 "SearchFilter.c" +#line 6761 "SearchFilter.c" } @@ -6699,54 +6783,54 @@ static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_a GtkToggleButton* _tmp5_ = NULL; GtkToggleButton* _tmp6_ = NULL; GtkToggleButton* _tmp7_ = NULL; -#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_val_if_fail (action != NULL, NULL); -#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = (SearchFilterToolbarToggleActionToolButton*) g_object_new (object_type, NULL); -#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = (GtkToggleButton*) gtk_toggle_button_new (); -#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_ref_sink (_tmp0_); -#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->button); -#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->button = _tmp0_; -#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = self->priv->button; -#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = self->priv->button; -#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = action; -#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_ACTIONABLE, GtkActionable), _tmp3_); -#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4_ = self->priv->button; -#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->button; -#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE); -#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 641 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp6_ = self->priv->button; -#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 641 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2); -#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp7_ = self->priv->button; -#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 6743 "SearchFilter.c" +#line 6827 "SearchFilter.c" } static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) { -#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_toggle_action_tool_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, action); -#line 6750 "SearchFilter.c" +#line 6834 "SearchFilter.c" } @@ -6754,68 +6838,43 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc GtkImage* image = NULL; GtkToggleButton* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GtkImage* _tmp7_ = NULL; - GtkToggleButton* _tmp8_ = NULL; - GtkImage* _tmp9_ = NULL; -#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala" + GtkImage* _tmp2_ = NULL; + GtkImage* _tmp3_ = NULL; + GtkToggleButton* _tmp4_ = NULL; + GtkImage* _tmp5_ = NULL; +#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self)); -#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_return_if_fail (icon_name != NULL); -#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" image = NULL; -#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->button; -#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE); -#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp1_ = icon_name; -#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp2_ = string_contains (_tmp1_, "disabled"); -#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" - if (_tmp2_) { -#line 6778 "SearchFilter.c" - const gchar* _tmp3_ = NULL; - GtkImage* _tmp4_ = NULL; -#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp3_ = icon_name; -#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp4_ = (GtkImage*) gtk_image_new_from_stock (_tmp3_, GTK_ICON_SIZE_SMALL_TOOLBAR); -#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp4_); -#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (image); -#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala" - image = _tmp4_; -#line 6791 "SearchFilter.c" - } else { - const gchar* _tmp5_ = NULL; - GtkImage* _tmp6_ = NULL; #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp5_ = icon_name; + _tmp1_ = icon_name; #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp6_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp5_, GTK_ICON_SIZE_SMALL_TOOLBAR); + _tmp2_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp1_, GTK_ICON_SIZE_SMALL_TOOLBAR); #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp2_); #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _g_object_unref0 (image); + _g_object_unref0 (image); #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala" - image = _tmp6_; -#line 6805 "SearchFilter.c" - } + image = _tmp2_; #line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp7_ = image; + _tmp3_ = image; #line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 6); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 6); #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp8_ = self->priv->button; + _tmp4_ = self->priv->button; #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala" - _tmp9_ = image; + _tmp5_ = image; #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala" - gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala" + gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); +#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (image); -#line 6819 "SearchFilter.c" +#line 6878 "SearchFilter.c" } @@ -6832,37 +6891,37 @@ static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFil _tmp1_ = label; #line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_); -#line 6836 "SearchFilter.c" +#line 6895 "SearchFilter.c" } static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFilterToolbarToggleActionToolButtonClass * klass) { -#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_toggle_action_tool_button_parent_class = g_type_class_peek_parent (klass); -#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate)); -#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize; -#line 6847 "SearchFilter.c" +#line 6906 "SearchFilter.c" } static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) { -#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self); -#line 6854 "SearchFilter.c" +#line 6913 "SearchFilter.c" } static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* obj) { SearchFilterToolbarToggleActionToolButton * self; -#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButton); -#line 630 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->button); -#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj); -#line 6866 "SearchFilter.c" +#line 6925 "SearchFilter.c" } @@ -6881,42 +6940,42 @@ static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) { static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) { #line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text); -#line 6885 "SearchFilter.c" +#line 6944 "SearchFilter.c" } static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self) { #line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive); -#line 6892 "SearchFilter.c" +#line 6951 "SearchFilter.c" } static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self) { #line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible); -#line 6899 "SearchFilter.c" +#line 6958 "SearchFilter.c" } static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, guint position, guint n_chars, gpointer self) { #line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self); -#line 6906 "SearchFilter.c" +#line 6965 "SearchFilter.c" } static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self) { #line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self); -#line 6913 "SearchFilter.c" +#line 6972 "SearchFilter.c" } static gpointer _text_action_ref0 (gpointer self) { #line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self ? text_action_ref (self) : NULL; -#line 6920 "SearchFilter.c" +#line 6979 "SearchFilter.c" } @@ -6925,7 +6984,7 @@ static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_p result = search_filter_toolbar_search_box_on_escape_key ((SearchFilterToolbarSearchBox*) self, event); #line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 6929 "SearchFilter.c" +#line 6988 "SearchFilter.c" } @@ -7019,14 +7078,14 @@ SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType g_signal_connect_object (_tmp17_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0); #line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 7023 "SearchFilter.c" +#line 7082 "SearchFilter.c" } SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) { #line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action); -#line 7030 "SearchFilter.c" +#line 7089 "SearchFilter.c" } @@ -7038,7 +7097,7 @@ void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* s _tmp0_ = self->priv->search_entry; #line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "has-focus", TRUE, NULL); -#line 7042 "SearchFilter.c" +#line 7101 "SearchFilter.c" } @@ -7059,19 +7118,19 @@ static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterTool _tmp2_ = gdk_keyval_name (_tmp1_); #line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (g_strcmp0 (_tmp2_, "Escape") == 0) { -#line 7063 "SearchFilter.c" +#line 7122 "SearchFilter.c" TextAction* _tmp3_ = NULL; #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->action; #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala" text_action_clear (_tmp3_); -#line 7069 "SearchFilter.c" +#line 7128 "SearchFilter.c" } #line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = FALSE; #line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7075 "SearchFilter.c" +#line 7134 "SearchFilter.c" } @@ -7133,7 +7192,7 @@ static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilte _tmp14_ = _tmp13_; #line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp14_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0); -#line 7137 "SearchFilter.c" +#line 7196 "SearchFilter.c" } @@ -7164,7 +7223,7 @@ static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolb _tmp5_ = self->priv->action; #line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_connect_object (_tmp5_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0); -#line 7168 "SearchFilter.c" +#line 7227 "SearchFilter.c" } @@ -7176,7 +7235,7 @@ static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilte _tmp0_ = sensitive; #line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 7180 "SearchFilter.c" +#line 7239 "SearchFilter.c" } @@ -7188,7 +7247,7 @@ static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilter _tmp0_ = visible; #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 7192 "SearchFilter.c" +#line 7251 "SearchFilter.c" } @@ -7202,23 +7261,23 @@ static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterTool _tmp1_ = text; #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_ != NULL) { -#line 7206 "SearchFilter.c" +#line 7265 "SearchFilter.c" const gchar* _tmp2_ = NULL; #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = text; #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = _tmp2_; -#line 7212 "SearchFilter.c" +#line 7271 "SearchFilter.c" } else { #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = ""; -#line 7216 "SearchFilter.c" +#line 7275 "SearchFilter.c" } #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp3_ = self->priv->search_entry; #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_); -#line 7222 "SearchFilter.c" +#line 7281 "SearchFilter.c" } @@ -7229,14 +7288,14 @@ static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSear g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate)); #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize; -#line 7233 "SearchFilter.c" +#line 7292 "SearchFilter.c" } static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) { #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self); -#line 7240 "SearchFilter.c" +#line 7299 "SearchFilter.c" } @@ -7302,7 +7361,7 @@ static void search_filter_toolbar_search_box_finalize (GObject* obj) { _text_action_unref0 (self->priv->action); #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj); -#line 7306 "SearchFilter.c" +#line 7365 "SearchFilter.c" } @@ -7378,14 +7437,14 @@ SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_butto gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); #line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 7382 "SearchFilter.c" +#line 7441 "SearchFilter.c" } SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) { #line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model); -#line 7389 "SearchFilter.c" +#line 7448 "SearchFilter.c" } @@ -7411,7 +7470,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se switch (_tmp0_) { #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 7415 "SearchFilter.c" +#line 7474 "SearchFilter.c" { gchar* _tmp1_ = NULL; #line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -7422,11 +7481,11 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se filename = _tmp1_; #line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7426 "SearchFilter.c" +#line 7485 "SearchFilter.c" } #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_ONLY: -#line 7430 "SearchFilter.c" +#line 7489 "SearchFilter.c" { gchar* _tmp2_ = NULL; #line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -7437,12 +7496,12 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se filename = _tmp2_; #line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7441 "SearchFilter.c" +#line 7500 "SearchFilter.c" } default: #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 7446 "SearchFilter.c" +#line 7505 "SearchFilter.c" { gchar* _tmp3_ = NULL; #line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -7453,7 +7512,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se filename = _tmp3_; #line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7457 "SearchFilter.c" +#line 7516 "SearchFilter.c" } } #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -7484,7 +7543,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se _g_free0 (filename); #line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7488 "SearchFilter.c" +#line 7547 "SearchFilter.c" } @@ -7508,7 +7567,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea switch (_tmp0_) { #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 7512 "SearchFilter.c" +#line 7571 "SearchFilter.c" { gint _tmp1_ = 0; gint _tmp2_ = 0; @@ -7520,11 +7579,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea result = _tmp1_ + _tmp2_; #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7524 "SearchFilter.c" +#line 7583 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 7528 "SearchFilter.c" +#line 7587 "SearchFilter.c" { gint _tmp3_ = 0; gint _tmp4_ = 0; @@ -7536,11 +7595,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea result = (_tmp3_ * 2) + _tmp4_; #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7540 "SearchFilter.c" +#line 7599 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 7544 "SearchFilter.c" +#line 7603 "SearchFilter.c" { gint _tmp5_ = 0; gint _tmp6_ = 0; @@ -7552,11 +7611,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea result = (_tmp5_ * 3) + _tmp6_; #line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7556 "SearchFilter.c" +#line 7615 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 7560 "SearchFilter.c" +#line 7619 "SearchFilter.c" { gint _tmp7_ = 0; gint _tmp8_ = 0; @@ -7568,13 +7627,13 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea result = (_tmp7_ * 4) + _tmp8_; #line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7572 "SearchFilter.c" +#line 7631 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_OR_HIGHER: #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_ONLY: -#line 7578 "SearchFilter.c" +#line 7637 "SearchFilter.c" { gint _tmp9_ = 0; #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -7583,37 +7642,37 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea result = _tmp9_ * 5; #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7587 "SearchFilter.c" +#line 7646 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 7591 "SearchFilter.c" +#line 7650 "SearchFilter.c" { #line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE; #line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7597 "SearchFilter.c" +#line 7656 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 7601 "SearchFilter.c" +#line 7660 "SearchFilter.c" { #line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE; #line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7607 "SearchFilter.c" +#line 7666 "SearchFilter.c" } #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_REJECTED_ONLY: -#line 7611 "SearchFilter.c" +#line 7670 "SearchFilter.c" { #line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = icon_plus; #line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7617 "SearchFilter.c" +#line 7676 "SearchFilter.c" } default: { @@ -7621,7 +7680,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea result = icon_base; #line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7625 "SearchFilter.c" +#line 7684 "SearchFilter.c" } } } @@ -7647,7 +7706,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo switch (_tmp1_) { #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 7651 "SearchFilter.c" +#line 7710 "SearchFilter.c" { GtkMenuButton* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; @@ -7659,11 +7718,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _tmp3_); #line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7663 "SearchFilter.c" +#line 7722 "SearchFilter.c" } #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 7667 "SearchFilter.c" +#line 7726 "SearchFilter.c" { GtkMenuButton* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -7675,11 +7734,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _tmp5_); #line 819 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7679 "SearchFilter.c" +#line 7738 "SearchFilter.c" } #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 7683 "SearchFilter.c" +#line 7742 "SearchFilter.c" { GtkMenuButton* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -7691,11 +7750,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _tmp7_); #line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7695 "SearchFilter.c" +#line 7754 "SearchFilter.c" } #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 7699 "SearchFilter.c" +#line 7758 "SearchFilter.c" { GtkMenuButton* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; @@ -7707,13 +7766,13 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp9_); #line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7711 "SearchFilter.c" +#line 7770 "SearchFilter.c" } #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_ONLY: #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 7717 "SearchFilter.c" +#line 7776 "SearchFilter.c" { GtkMenuButton* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; @@ -7725,7 +7784,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_button_get_type (), GtkButton), _tmp11_); #line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7729 "SearchFilter.c" +#line 7788 "SearchFilter.c" } default: { @@ -7755,7 +7814,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo _g_object_unref0 (_tmp17_); #line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 7759 "SearchFilter.c" +#line 7818 "SearchFilter.c" } } #line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -7778,7 +7837,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); #line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 7782 "SearchFilter.c" +#line 7841 "SearchFilter.c" } @@ -7796,7 +7855,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (S result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN); #line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 7800 "SearchFilter.c" +#line 7859 "SearchFilter.c" } @@ -7813,7 +7872,7 @@ void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRa _tmp1_ = label; #line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_); -#line 7817 "SearchFilter.c" +#line 7876 "SearchFilter.c" } @@ -7822,7 +7881,7 @@ static void search_filter_toolbar_rating_filter_button_class_init (SearchFilterT search_filter_toolbar_rating_filter_button_parent_class = g_type_class_peek_parent (klass); #line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize; -#line 7826 "SearchFilter.c" +#line 7885 "SearchFilter.c" } @@ -7838,7 +7897,7 @@ static void search_filter_toolbar_rating_filter_button_finalize (GObject* obj) { _g_object_unref0 (self->button); #line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj); -#line 7842 "SearchFilter.c" +#line 7901 "SearchFilter.c" } @@ -7857,7 +7916,7 @@ GType search_filter_toolbar_rating_filter_button_get_type (void) { static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self); -#line 7861 "SearchFilter.c" +#line 7920 "SearchFilter.c" } @@ -7917,14 +7976,14 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f _g_object_unref0 (image); #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 7921 "SearchFilter.c" +#line 7980 "SearchFilter.c" } SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) { #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_saved_search_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON); -#line 7928 "SearchFilter.c" +#line 7987 "SearchFilter.c" } @@ -7933,7 +7992,7 @@ static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchF g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self)); #line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "clicked"); -#line 7937 "SearchFilter.c" +#line 7996 "SearchFilter.c" } @@ -7948,7 +8007,7 @@ void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterTo _tmp1_ = active; #line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_toggle_button_set_active (_tmp0_, _tmp1_); -#line 7952 "SearchFilter.c" +#line 8011 "SearchFilter.c" } @@ -7965,7 +8024,7 @@ void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToo _tmp1_ = label; #line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_); -#line 7969 "SearchFilter.c" +#line 8028 "SearchFilter.c" } @@ -7982,7 +8041,7 @@ void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolb _tmp1_ = self->button; #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE); -#line 7986 "SearchFilter.c" +#line 8045 "SearchFilter.c" } @@ -7993,14 +8052,14 @@ static void search_filter_toolbar_saved_search_filter_button_class_init (SearchF G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_filter_button_finalize; #line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 7997 "SearchFilter.c" +#line 8056 "SearchFilter.c" } static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) { #line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->filter_popup = NULL; -#line 8004 "SearchFilter.c" +#line 8063 "SearchFilter.c" } @@ -8022,7 +8081,7 @@ static void search_filter_toolbar_saved_search_filter_button_finalize (GObject* _g_object_unref0 (self->button); #line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj); -#line 8026 "SearchFilter.c" +#line 8085 "SearchFilter.c" } @@ -8041,35 +8100,35 @@ GType search_filter_toolbar_saved_search_filter_button_get_type (void) { static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) { #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search); -#line 8045 "SearchFilter.c" +#line 8104 "SearchFilter.c" } static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) { #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search); -#line 8052 "SearchFilter.c" +#line 8111 "SearchFilter.c" } static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self); -#line 8059 "SearchFilter.c" +#line 8118 "SearchFilter.c" } static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, GtkListBoxRow* row, gpointer self) { #line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row); -#line 8066 "SearchFilter.c" +#line 8125 "SearchFilter.c" } static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self) { #line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self); -#line 8073 "SearchFilter.c" +#line 8132 "SearchFilter.c" } @@ -8080,13 +8139,13 @@ static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton* *size = (*size) ? (2 * (*size)) : 4; #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" *array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1); -#line 8084 "SearchFilter.c" +#line 8143 "SearchFilter.c" } #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[(*length)++] = value; #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[*length] = NULL; -#line 8090 "SearchFilter.c" +#line 8149 "SearchFilter.c" } @@ -8097,13 +8156,13 @@ static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton* *size = (*size) ? (2 * (*size)) : 4; #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" *array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1); -#line 8101 "SearchFilter.c" +#line 8160 "SearchFilter.c" } #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[(*length)++] = value; #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala" (*array)[*length] = NULL; -#line 8107 "SearchFilter.c" +#line 8166 "SearchFilter.c" } @@ -8169,7 +8228,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove self->priv->delete_buttons_length1 = 0; #line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1; -#line 8173 "SearchFilter.c" +#line 8232 "SearchFilter.c" { GeeIterator* _search_it = NULL; SavedSearchTable* _tmp6_ = NULL; @@ -8198,7 +8257,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove _search_it = _tmp11_; #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" while (TRUE) { -#line 8202 "SearchFilter.c" +#line 8261 "SearchFilter.c" GeeIterator* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; SavedSearch* search = NULL; @@ -8246,7 +8305,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove if (!_tmp13_) { #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8250 "SearchFilter.c" +#line 8309 "SearchFilter.c" } #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp14_ = _search_it; @@ -8362,11 +8421,11 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove _g_object_unref0 (row); #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (search); -#line 8366 "SearchFilter.c" +#line 8425 "SearchFilter.c" } #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_search_it); -#line 8370 "SearchFilter.c" +#line 8429 "SearchFilter.c" } #line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON); @@ -8404,14 +8463,14 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove search_filter_toolbar_saved_search_popover_restyle (self); #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 8408 "SearchFilter.c" +#line 8467 "SearchFilter.c" } SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) { #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_saved_search_popover_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, relative_to); -#line 8415 "SearchFilter.c" +#line 8474 "SearchFilter.c" } @@ -8431,7 +8490,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave _tmp1_ = self->priv->edit_buttons; #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1__length1 = self->priv->edit_buttons_length1; -#line 8435 "SearchFilter.c" +#line 8494 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; @@ -8443,14 +8502,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave button_collection_length1 = _tmp1__length1; #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) { -#line 8447 "SearchFilter.c" +#line 8506 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp2_ = _g_object_ref0 (button_collection[button_it]); #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp2_; -#line 8454 "SearchFilter.c" +#line 8513 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL; #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -8459,7 +8518,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_); #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 8463 "SearchFilter.c" +#line 8522 "SearchFilter.c" } } } @@ -8467,7 +8526,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave _tmp4_ = self->priv->delete_buttons; #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4__length1 = self->priv->delete_buttons_length1; -#line 8471 "SearchFilter.c" +#line 8530 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; @@ -8479,14 +8538,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave button_collection_length1 = _tmp4__length1; #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) { -#line 8483 "SearchFilter.c" +#line 8542 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = _g_object_ref0 (button_collection[button_it]); #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp5_; -#line 8490 "SearchFilter.c" +#line 8549 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL; #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" @@ -8495,7 +8554,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_); #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 8499 "SearchFilter.c" +#line 8558 "SearchFilter.c" } } } @@ -8523,7 +8582,7 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search result = FALSE; #line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8527 "SearchFilter.c" +#line 8586 "SearchFilter.c" } #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = row; @@ -8545,13 +8604,13 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search result = FALSE; #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8549 "SearchFilter.c" +#line 8608 "SearchFilter.c" } #line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" result = TRUE; #line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8555 "SearchFilter.c" +#line 8614 "SearchFilter.c" } @@ -8622,7 +8681,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (Searc _g_object_unref0 (button); #line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8626 "SearchFilter.c" +#line 8685 "SearchFilter.c" } @@ -8640,7 +8699,7 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi _tmp1_ = search_filter_toolbar_saved_search_popover_is_search_row (self, _tmp0_); #line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (_tmp1_) { -#line 8644 "SearchFilter.c" +#line 8703 "SearchFilter.c" GtkListBoxRow* _tmp2_ = NULL; SavedSearch* _tmp3_ = NULL; SavedSearch* _tmp4_ = NULL; @@ -8654,13 +8713,13 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi g_signal_emit_by_name (self, "search-activated", _tmp4_); #line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (_tmp4_); -#line 8658 "SearchFilter.c" +#line 8717 "SearchFilter.c" } #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = self->priv->popover; #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 8664 "SearchFilter.c" +#line 8723 "SearchFilter.c" } @@ -8674,7 +8733,7 @@ static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilt _tmp0_ = search; #line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "edit-clicked", _tmp0_); -#line 8678 "SearchFilter.c" +#line 8737 "SearchFilter.c" } @@ -8688,7 +8747,7 @@ static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFi _tmp0_ = search; #line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "delete-clicked", _tmp0_); -#line 8692 "SearchFilter.c" +#line 8751 "SearchFilter.c" } @@ -8697,7 +8756,7 @@ static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilte g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); #line 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "add-clicked"); -#line 8701 "SearchFilter.c" +#line 8760 "SearchFilter.c" } @@ -8706,7 +8765,7 @@ static void search_filter_toolbar_saved_search_popover_on_popover_closed (Search g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self)); #line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "closed"); -#line 8710 "SearchFilter.c" +#line 8769 "SearchFilter.c" } @@ -8718,7 +8777,7 @@ void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSav _tmp0_ = self->priv->popover; #line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 8722 "SearchFilter.c" +#line 8781 "SearchFilter.c" } @@ -8730,14 +8789,14 @@ void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSe _tmp0_ = self->priv->popover; #line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 8734 "SearchFilter.c" +#line 8793 "SearchFilter.c" } static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self); -#line 8741 "SearchFilter.c" +#line 8800 "SearchFilter.c" } @@ -8780,14 +8839,14 @@ static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_sa g_signal_connect_object (_tmp4_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self, 0); #line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala" return self; -#line 8784 "SearchFilter.c" +#line 8843 "SearchFilter.c" } static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name) { #line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala" return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name); -#line 8791 "SearchFilter.c" +#line 8850 "SearchFilter.c" } @@ -8804,7 +8863,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_restyle (Sear _tmp1_ = self->priv->button; #line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala" gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE); -#line 8808 "SearchFilter.c" +#line 8867 "SearchFilter.c" } @@ -8816,7 +8875,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_on_click (Sea _tmp0_ = self->priv->_search; #line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_emit_by_name (self, "clicked", _tmp0_); -#line 8820 "SearchFilter.c" +#line 8879 "SearchFilter.c" } @@ -8831,7 +8890,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_s result = _tmp0_; #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" return result; -#line 8835 "SearchFilter.c" +#line 8894 "SearchFilter.c" } @@ -8850,7 +8909,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_set_search (S self->priv->_search = _tmp1_; #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_object_notify ((GObject *) self, "search"); -#line 8854 "SearchFilter.c" +#line 8913 "SearchFilter.c" } @@ -8869,7 +8928,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_class_init (S g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH, g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 8873 "SearchFilter.c" +#line 8932 "SearchFilter.c" } @@ -8878,7 +8937,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_instance_init self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE (self); #line 913 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->button = NULL; -#line 8882 "SearchFilter.c" +#line 8941 "SearchFilter.c" } @@ -8900,7 +8959,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_finalize (GOb _g_object_unref0 (self->priv->_search); #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj); -#line 8904 "SearchFilter.c" +#line 8963 "SearchFilter.c" } @@ -8927,13 +8986,13 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_pro g_value_set_object (value, search_filter_toolbar_saved_search_popover_data_button_get_search (self)); #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8931 "SearchFilter.c" +#line 8990 "SearchFilter.c" default: #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8937 "SearchFilter.c" +#line 8996 "SearchFilter.c" } } @@ -8949,13 +9008,13 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_pro search_filter_toolbar_saved_search_popover_data_button_set_search (self, g_value_get_object (value)); #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8953 "SearchFilter.c" +#line 9012 "SearchFilter.c" default: #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala" break; -#line 8959 "SearchFilter.c" +#line 9018 "SearchFilter.c" } } @@ -8963,7 +9022,7 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_pro static void search_filter_toolbar_value_saved_search_popover_init (GValue* value) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 8967 "SearchFilter.c" +#line 9026 "SearchFilter.c" } @@ -8972,7 +9031,7 @@ static void search_filter_toolbar_value_saved_search_popover_free_value (GValue* if (value->data[0].v_pointer) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer); -#line 8976 "SearchFilter.c" +#line 9035 "SearchFilter.c" } } @@ -8982,11 +9041,11 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G if (src_value->data[0].v_pointer) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (src_value->data[0].v_pointer); -#line 8986 "SearchFilter.c" +#line 9045 "SearchFilter.c" } else { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" dest_value->data[0].v_pointer = NULL; -#line 8990 "SearchFilter.c" +#line 9049 "SearchFilter.c" } } @@ -8994,37 +9053,37 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G static gpointer search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 8998 "SearchFilter.c" +#line 9057 "SearchFilter.c" } static gchar* search_filter_toolbar_value_saved_search_popover_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (collect_values[0].v_pointer) { -#line 9005 "SearchFilter.c" +#line 9064 "SearchFilter.c" SearchFilterToolbarSavedSearchPopover* object; object = collect_values[0].v_pointer; #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (object->parent_instance.g_class == NULL) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9012 "SearchFilter.c" +#line 9071 "SearchFilter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.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 9016 "SearchFilter.c" +#line 9075 "SearchFilter.c" } #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object); -#line 9020 "SearchFilter.c" +#line 9079 "SearchFilter.c" } else { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 9024 "SearchFilter.c" +#line 9083 "SearchFilter.c" } #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 9028 "SearchFilter.c" +#line 9087 "SearchFilter.c" } @@ -9035,25 +9094,25 @@ static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (cons if (!object_p) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9039 "SearchFilter.c" +#line 9098 "SearchFilter.c" } #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (!value->data[0].v_pointer) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = NULL; -#line 9045 "SearchFilter.c" +#line 9104 "SearchFilter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = value->data[0].v_pointer; -#line 9049 "SearchFilter.c" +#line 9108 "SearchFilter.c" } else { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" *object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer); -#line 9053 "SearchFilter.c" +#line 9112 "SearchFilter.c" } #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return NULL; -#line 9057 "SearchFilter.c" +#line 9116 "SearchFilter.c" } @@ -9067,7 +9126,7 @@ GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return G_PARAM_SPEC (spec); -#line 9071 "SearchFilter.c" +#line 9130 "SearchFilter.c" } @@ -9076,7 +9135,7 @@ gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* val g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL); #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return value->data[0].v_pointer; -#line 9080 "SearchFilter.c" +#line 9139 "SearchFilter.c" } @@ -9096,17 +9155,17 @@ void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpoint value->data[0].v_pointer = v_object; #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer); -#line 9100 "SearchFilter.c" +#line 9159 "SearchFilter.c" } else { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 9104 "SearchFilter.c" +#line 9163 "SearchFilter.c" } #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_unref (old); -#line 9110 "SearchFilter.c" +#line 9169 "SearchFilter.c" } } @@ -9125,17 +9184,17 @@ void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpoin g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = v_object; -#line 9129 "SearchFilter.c" +#line 9188 "SearchFilter.c" } else { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" value->data[0].v_pointer = NULL; -#line 9133 "SearchFilter.c" +#line 9192 "SearchFilter.c" } #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" if (old) { #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_saved_search_popover_unref (old); -#line 9139 "SearchFilter.c" +#line 9198 "SearchFilter.c" } } @@ -9157,7 +9216,7 @@ static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterT g_signal_new ("add_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9161 "SearchFilter.c" +#line 9220 "SearchFilter.c" } @@ -9184,7 +9243,7 @@ static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilt self->priv->add = NULL; #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->ref_count = 1; -#line 9188 "SearchFilter.c" +#line 9247 "SearchFilter.c" } @@ -9208,7 +9267,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo _tmp0_ = self->priv->edit_buttons; #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0__length1 = self->priv->edit_buttons_length1; -#line 9212 "SearchFilter.c" +#line 9271 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; @@ -9220,14 +9279,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo button_collection_length1 = _tmp0__length1; #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) { -#line 9224 "SearchFilter.c" +#line 9283 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_ = NULL; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp1_ = _g_object_ref0 (button_collection[button_it]); #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp1_; -#line 9231 "SearchFilter.c" +#line 9290 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL; guint _tmp3_ = 0U; @@ -9239,7 +9298,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 9243 "SearchFilter.c" +#line 9302 "SearchFilter.c" } } } @@ -9247,7 +9306,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo _tmp4_ = self->priv->delete_buttons; #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp4__length1 = self->priv->delete_buttons_length1; -#line 9251 "SearchFilter.c" +#line 9310 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL; gint button_collection_length1 = 0; @@ -9259,14 +9318,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo button_collection_length1 = _tmp4__length1; #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) { -#line 9263 "SearchFilter.c" +#line 9322 "SearchFilter.c" SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL; SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL; #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp5_ = _g_object_ref0 (button_collection[button_it]); #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" button = _tmp5_; -#line 9270 "SearchFilter.c" +#line 9329 "SearchFilter.c" { SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL; guint _tmp7_ = 0U; @@ -9278,7 +9337,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self); #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (button); -#line 9282 "SearchFilter.c" +#line 9341 "SearchFilter.c" } } } @@ -9310,7 +9369,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL); #line 903 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->add); -#line 9314 "SearchFilter.c" +#line 9373 "SearchFilter.c" } @@ -9335,7 +9394,7 @@ gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" return instance; -#line 9339 "SearchFilter.c" +#line 9398 "SearchFilter.c" } @@ -9348,19 +9407,19 @@ void search_filter_toolbar_saved_search_popover_unref (gpointer instance) { SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self); #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9352 "SearchFilter.c" +#line 9411 "SearchFilter.c" } } static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass) { -#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala" search_filter_toolbar_parent_class = g_type_class_peek_parent (klass); -#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate)); -#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize; -#line 9364 "SearchFilter.c" +#line 9423 "SearchFilter.c" } @@ -9369,7 +9428,7 @@ static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) { GtkMenuItem* _tmp1_ = NULL; GtkBuilder* _tmp2_ = NULL; SearchFilterToolbarSavedSearchFilterButton* _tmp3_ = NULL; -#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv = SEARCH_FILTER_TOOLBAR_GET_PRIVATE (self); #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = (GtkMenu*) gtk_menu_new (); @@ -9399,7 +9458,7 @@ static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) { self->priv->elide_showing_again = FALSE; #line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala" self->priv->search_filter = NULL; -#line 9403 "SearchFilter.c" +#line 9462 "SearchFilter.c" } @@ -9423,7 +9482,7 @@ static void search_filter_toolbar_finalize (GObject* obj) { guint _tmp15_ = 0U; GtkToolbar* _tmp16_ = NULL; guint _tmp17_ = 0U; -#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar); #line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala" _tmp0_ = self->priv->actions; @@ -9479,7 +9538,7 @@ static void search_filter_toolbar_finalize (GObject* obj) { g_signal_parse_name ("popup-context-menu", gtk_toolbar_get_type (), &_tmp17_, NULL, FALSE); #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala" g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self); -#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 607 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->toolbar); #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->close_menu); @@ -9515,9 +9574,9 @@ static void search_filter_toolbar_finalize (GObject* obj) { _g_object_unref0 (self->priv->sepr_flagged_rating); #line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala" _g_object_unref0 (self->priv->sepr_rating_saved); -#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala" +#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala" G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj); -#line 9521 "SearchFilter.c" +#line 9580 "SearchFilter.c" } |