diff options
Diffstat (limited to 'src/searches/SearchBoolean.c')
| -rw-r--r-- | src/searches/SearchBoolean.c | 979 |
1 files changed, 492 insertions, 487 deletions
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c index 15a6e82..2667236 100644 --- a/src/searches/SearchBoolean.c +++ b/src/searches/SearchBoolean.c @@ -1,4 +1,4 @@ -/* SearchBoolean.c generated by valac 0.34.4, the Vala compiler +/* SearchBoolean.c generated by valac 0.34.7, the Vala compiler * generated from SearchBoolean.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1714,11 +1714,12 @@ GType search_condition_search_type_get_type (void) { static gboolean search_condition_real_predicate (SearchCondition* self, MediaSource* source) { + gboolean _tmp0_ = FALSE; #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("Type `%s' does not implement abstract method `search_condition_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - return FALSE; -#line 1722 "SearchBoolean.c" + return _tmp0_; +#line 1723 "SearchBoolean.c" } @@ -1727,7 +1728,7 @@ gboolean search_condition_predicate (SearchCondition* self, MediaSource* source) g_return_val_if_fail (IS_SEARCH_CONDITION (self), FALSE); #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return SEARCH_CONDITION_GET_CLASS (self)->predicate (self, source); -#line 1731 "SearchBoolean.c" +#line 1732 "SearchBoolean.c" } @@ -1737,7 +1738,7 @@ SearchCondition* search_condition_construct (GType object_type) { self = (SearchCondition*) g_type_create_instance (object_type); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 1741 "SearchBoolean.c" +#line 1742 "SearchBoolean.c" } @@ -1752,7 +1753,7 @@ SearchConditionSearchType search_condition_get_search_type (SearchCondition* sel result = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 1756 "SearchBoolean.c" +#line 1757 "SearchBoolean.c" } @@ -1764,14 +1765,14 @@ void search_condition_set_search_type (SearchCondition* self, SearchConditionSea _tmp0_ = value; #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_search_type = _tmp0_; -#line 1768 "SearchBoolean.c" +#line 1769 "SearchBoolean.c" } static void value_search_condition_init (GValue* value) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1775 "SearchBoolean.c" +#line 1776 "SearchBoolean.c" } @@ -1780,7 +1781,7 @@ static void value_search_condition_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (value->data[0].v_pointer); -#line 1784 "SearchBoolean.c" +#line 1785 "SearchBoolean.c" } } @@ -1790,11 +1791,11 @@ static void value_search_condition_copy_value (const GValue* src_value, GValue* if (src_value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = search_condition_ref (src_value->data[0].v_pointer); -#line 1794 "SearchBoolean.c" +#line 1795 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = NULL; -#line 1798 "SearchBoolean.c" +#line 1799 "SearchBoolean.c" } } @@ -1802,37 +1803,37 @@ static void value_search_condition_copy_value (const GValue* src_value, GValue* static gpointer value_search_condition_peek_pointer (const GValue* value) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 1806 "SearchBoolean.c" +#line 1807 "SearchBoolean.c" } static gchar* value_search_condition_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (collect_values[0].v_pointer) { -#line 1813 "SearchBoolean.c" +#line 1814 "SearchBoolean.c" SearchCondition* object; object = collect_values[0].v_pointer; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (object->parent_instance.g_class == NULL) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1820 "SearchBoolean.c" +#line 1821 "SearchBoolean.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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 1824 "SearchBoolean.c" +#line 1825 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = search_condition_ref (object); -#line 1828 "SearchBoolean.c" +#line 1829 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1832 "SearchBoolean.c" +#line 1833 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 1836 "SearchBoolean.c" +#line 1837 "SearchBoolean.c" } @@ -1843,25 +1844,25 @@ static gchar* value_search_condition_lcopy_value (const GValue* value, guint n_c if (!object_p) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1847 "SearchBoolean.c" +#line 1848 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!value->data[0].v_pointer) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = NULL; -#line 1853 "SearchBoolean.c" +#line 1854 "SearchBoolean.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = value->data[0].v_pointer; -#line 1857 "SearchBoolean.c" +#line 1858 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = search_condition_ref (value->data[0].v_pointer); -#line 1861 "SearchBoolean.c" +#line 1862 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 1865 "SearchBoolean.c" +#line 1866 "SearchBoolean.c" } @@ -1875,7 +1876,7 @@ GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, c G_PARAM_SPEC (spec)->value_type = object_type; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return G_PARAM_SPEC (spec); -#line 1879 "SearchBoolean.c" +#line 1880 "SearchBoolean.c" } @@ -1884,7 +1885,7 @@ gpointer value_get_search_condition (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION), NULL); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 1888 "SearchBoolean.c" +#line 1889 "SearchBoolean.c" } @@ -1904,17 +1905,17 @@ void value_set_search_condition (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_ref (value->data[0].v_pointer); -#line 1908 "SearchBoolean.c" +#line 1909 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1912 "SearchBoolean.c" +#line 1913 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (old); -#line 1918 "SearchBoolean.c" +#line 1919 "SearchBoolean.c" } } @@ -1933,17 +1934,17 @@ void value_take_search_condition (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = v_object; -#line 1937 "SearchBoolean.c" +#line 1938 "SearchBoolean.c" } else { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 1941 "SearchBoolean.c" +#line 1942 "SearchBoolean.c" } #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_unref (old); -#line 1947 "SearchBoolean.c" +#line 1948 "SearchBoolean.c" } } @@ -1956,8 +1957,8 @@ static void search_condition_class_init (SearchConditionClass * klass) { #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionPrivate)); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_real_predicate; -#line 1961 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_real_predicate; +#line 1962 "SearchBoolean.c" } @@ -1966,7 +1967,7 @@ static void search_condition_instance_init (SearchCondition * self) { self->priv = SEARCH_CONDITION_GET_PRIVATE (self); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->ref_count = 1; -#line 1970 "SearchBoolean.c" +#line 1971 "SearchBoolean.c" } @@ -1976,7 +1977,7 @@ static void search_condition_finalize (SearchCondition* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION, SearchCondition); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_signal_handlers_destroy (self); -#line 1980 "SearchBoolean.c" +#line 1981 "SearchBoolean.c" } @@ -2001,7 +2002,7 @@ gpointer search_condition_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return instance; -#line 2005 "SearchBoolean.c" +#line 2006 "SearchBoolean.c" } @@ -2014,7 +2015,7 @@ void search_condition_unref (gpointer instance) { SEARCH_CONDITION_GET_CLASS (self)->finalize (self); #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2018 "SearchBoolean.c" +#line 2019 "SearchBoolean.c" } } @@ -2025,7 +2026,7 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) switch (self) { #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS: -#line 2029 "SearchBoolean.c" +#line 2030 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2034,11 +2035,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2038 "SearchBoolean.c" +#line 2039 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY: -#line 2042 "SearchBoolean.c" +#line 2043 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2047,11 +2048,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp1_; #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2051 "SearchBoolean.c" +#line 2052 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH: -#line 2055 "SearchBoolean.c" +#line 2056 "SearchBoolean.c" { gchar* _tmp2_ = NULL; #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2060,11 +2061,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp2_; #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2064 "SearchBoolean.c" +#line 2065 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH: -#line 2068 "SearchBoolean.c" +#line 2069 "SearchBoolean.c" { gchar* _tmp3_ = NULL; #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2073,11 +2074,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp3_; #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2077 "SearchBoolean.c" +#line 2078 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN: -#line 2081 "SearchBoolean.c" +#line 2082 "SearchBoolean.c" { gchar* _tmp4_ = NULL; #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2086,11 +2087,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp4_; #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2090 "SearchBoolean.c" +#line 2091 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET: -#line 2094 "SearchBoolean.c" +#line 2095 "SearchBoolean.c" { gchar* _tmp5_ = NULL; #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2099,11 +2100,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp5_; #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2103 "SearchBoolean.c" +#line 2104 "SearchBoolean.c" } #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET: -#line 2107 "SearchBoolean.c" +#line 2108 "SearchBoolean.c" { gchar* _tmp6_ = NULL; #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2112,14 +2113,14 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self) result = _tmp6_; #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2116 "SearchBoolean.c" +#line 2117 "SearchBoolean.c" } default: { #line 236 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:236: unrecognized text search context enumeration v" \ "alue"); -#line 2122 "SearchBoolean.c" +#line 2123 "SearchBoolean.c" } } } @@ -2138,7 +2139,7 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS; #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2141 "SearchBoolean.c" +#line 2142 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2149,7 +2150,7 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY; #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2152 "SearchBoolean.c" +#line 2153 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2160,7 +2161,7 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH; #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2163 "SearchBoolean.c" +#line 2164 "SearchBoolean.c" } else { const gchar* _tmp3_ = NULL; #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2171,7 +2172,7 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH; #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2174 "SearchBoolean.c" +#line 2175 "SearchBoolean.c" } else { const gchar* _tmp4_ = NULL; #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2182,7 +2183,7 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN; #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2185 "SearchBoolean.c" +#line 2186 "SearchBoolean.c" } else { const gchar* _tmp5_ = NULL; #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2193,7 +2194,7 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET; #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2196 "SearchBoolean.c" +#line 2197 "SearchBoolean.c" } else { const gchar* _tmp6_ = NULL; #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2204,14 +2205,14 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha result = SEARCH_CONDITION_TEXT_CONTEXT_IS_SET; #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2207 "SearchBoolean.c" +#line 2208 "SearchBoolean.c" } else { const gchar* _tmp7_ = NULL; #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = str; #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", _tmp7_); -#line 2214 "SearchBoolean.c" +#line 2215 "SearchBoolean.c" } } } @@ -2250,7 +2251,7 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _tmp2_ = text; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_ != NULL) { -#line 2253 "SearchBoolean.c" +#line 2254 "SearchBoolean.c" const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -2269,7 +2270,7 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _tmp1_ = _tmp6_; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); -#line 2272 "SearchBoolean.c" +#line 2273 "SearchBoolean.c" } else { gchar* _tmp7_ = NULL; #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2278,7 +2279,7 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _g_free0 (_tmp1_); #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = _tmp7_; -#line 2281 "SearchBoolean.c" +#line 2282 "SearchBoolean.c" } #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_text_set_text (self, _tmp1_); @@ -2290,14 +2291,14 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC _g_free0 (_tmp1_); #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 2293 "SearchBoolean.c" +#line 2294 "SearchBoolean.c" } SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) { #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_text_construct (TYPE_SEARCH_CONDITION_TEXT, search_type, text, context); -#line 2300 "SearchBoolean.c" +#line 2301 "SearchBoolean.c" } @@ -2317,7 +2318,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { result = _tmp1_ != NULL; #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2320 "SearchBoolean.c" +#line 2321 "SearchBoolean.c" } @@ -2336,7 +2337,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS: #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN: -#line 2339 "SearchBoolean.c" +#line 2340 "SearchBoolean.c" { gboolean _tmp1_ = FALSE; const gchar* _tmp2_ = NULL; @@ -2347,7 +2348,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp3_ = is_string_empty (_tmp2_); #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp3_) { -#line 2350 "SearchBoolean.c" +#line 2351 "SearchBoolean.c" const gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -2359,21 +2360,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp6_ = string_contains (_tmp4_, _tmp5_); #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = _tmp6_; -#line 2362 "SearchBoolean.c" +#line 2363 "SearchBoolean.c" } else { #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = FALSE; -#line 2366 "SearchBoolean.c" +#line 2367 "SearchBoolean.c" } #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp1_; #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2372 "SearchBoolean.c" +#line 2373 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY: -#line 2376 "SearchBoolean.c" +#line 2377 "SearchBoolean.c" { gboolean _tmp7_ = FALSE; const gchar* _tmp8_ = NULL; @@ -2384,7 +2385,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp9_ = is_string_empty (_tmp8_); #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp9_) { -#line 2387 "SearchBoolean.c" +#line 2388 "SearchBoolean.c" const gchar* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -2393,21 +2394,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp11_ = needle; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = g_strcmp0 (_tmp10_, _tmp11_) == 0; -#line 2396 "SearchBoolean.c" +#line 2397 "SearchBoolean.c" } else { #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp7_ = FALSE; -#line 2400 "SearchBoolean.c" +#line 2401 "SearchBoolean.c" } #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp7_; #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2406 "SearchBoolean.c" +#line 2407 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH: -#line 2410 "SearchBoolean.c" +#line 2411 "SearchBoolean.c" { gboolean _tmp12_ = FALSE; const gchar* _tmp13_ = NULL; @@ -2418,7 +2419,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp14_ = is_string_empty (_tmp13_); #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp14_) { -#line 2421 "SearchBoolean.c" +#line 2422 "SearchBoolean.c" const gchar* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; @@ -2430,21 +2431,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp17_ = g_str_has_prefix (_tmp15_, _tmp16_); #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = _tmp17_; -#line 2433 "SearchBoolean.c" +#line 2434 "SearchBoolean.c" } else { #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = FALSE; -#line 2437 "SearchBoolean.c" +#line 2438 "SearchBoolean.c" } #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp12_; #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2443 "SearchBoolean.c" +#line 2444 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH: -#line 2447 "SearchBoolean.c" +#line 2448 "SearchBoolean.c" { gboolean _tmp18_ = FALSE; const gchar* _tmp19_ = NULL; @@ -2455,7 +2456,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp20_ = is_string_empty (_tmp19_); #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp20_) { -#line 2458 "SearchBoolean.c" +#line 2459 "SearchBoolean.c" const gchar* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; @@ -2467,21 +2468,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c _tmp23_ = g_str_has_suffix (_tmp21_, _tmp22_); #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp18_ = _tmp23_; -#line 2470 "SearchBoolean.c" +#line 2471 "SearchBoolean.c" } else { #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp18_ = FALSE; -#line 2474 "SearchBoolean.c" +#line 2475 "SearchBoolean.c" } #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp18_; #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2480 "SearchBoolean.c" +#line 2481 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET: -#line 2484 "SearchBoolean.c" +#line 2485 "SearchBoolean.c" { const gchar* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; @@ -2493,11 +2494,11 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c result = _tmp25_; #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2496 "SearchBoolean.c" +#line 2497 "SearchBoolean.c" } #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET: -#line 2500 "SearchBoolean.c" +#line 2501 "SearchBoolean.c" { const gchar* _tmp26_ = NULL; gboolean _tmp27_ = FALSE; @@ -2509,25 +2510,25 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c result = !_tmp27_; #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2512 "SearchBoolean.c" +#line 2513 "SearchBoolean.c" } default: #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 2517 "SearchBoolean.c" +#line 2518 "SearchBoolean.c" } #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 2523 "SearchBoolean.c" +#line 2524 "SearchBoolean.c" } static gpointer _g_object_ref0 (gpointer self) { #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? g_object_ref (self) : NULL; -#line 2530 "SearchBoolean.c" +#line 2531 "SearchBoolean.c" } @@ -2566,7 +2567,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp2_) { #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; -#line 2569 "SearchBoolean.c" +#line 2570 "SearchBoolean.c" } else { SearchConditionSearchType _tmp3_ = 0; SearchConditionSearchType _tmp4_ = 0; @@ -2576,11 +2577,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp4_ = _tmp3_; #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = SEARCH_CONDITION_SEARCH_TYPE_TITLE == _tmp4_; -#line 2579 "SearchBoolean.c" +#line 2580 "SearchBoolean.c" } #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_) { -#line 2583 "SearchBoolean.c" +#line 2584 "SearchBoolean.c" gchar* _tmp5_ = NULL; MediaSource* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -2604,7 +2605,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp8_); #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp9_) { -#line 2607 "SearchBoolean.c" +#line 2608 "SearchBoolean.c" MediaSource* _tmp10_ = NULL; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; @@ -2631,13 +2632,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp14_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp12_); -#line 2634 "SearchBoolean.c" +#line 2635 "SearchBoolean.c" } else { #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = NULL; -#line 2640 "SearchBoolean.c" +#line 2641 "SearchBoolean.c" } #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp16_ = g_strdup (_tmp5_); @@ -2657,7 +2658,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (title); #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp5_); -#line 2660 "SearchBoolean.c" +#line 2661 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp22_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -2667,7 +2668,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp23_) { #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp21_ = TRUE; -#line 2670 "SearchBoolean.c" +#line 2671 "SearchBoolean.c" } else { SearchConditionSearchType _tmp24_ = 0; SearchConditionSearchType _tmp25_ = 0; @@ -2677,11 +2678,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp25_ = _tmp24_; #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp21_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp25_; -#line 2680 "SearchBoolean.c" +#line 2681 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp21_) { -#line 2684 "SearchBoolean.c" +#line 2685 "SearchBoolean.c" GeeList* tag_list = NULL; TagSourceCollection* _tmp26_ = NULL; MediaSource* _tmp27_ = NULL; @@ -2699,7 +2700,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp29_ = tag_list; #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (NULL != _tmp29_) { -#line 2702 "SearchBoolean.c" +#line 2703 "SearchBoolean.c" gchar* itag = NULL; { GeeList* _tag_list = NULL; @@ -2728,7 +2729,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tag_index = -1; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 2731 "SearchBoolean.c" +#line 2732 "SearchBoolean.c" gint _tmp35_ = 0; gint _tmp36_ = 0; gint _tmp37_ = 0; @@ -2756,7 +2757,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (!(_tmp36_ < _tmp37_)) { #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 2759 "SearchBoolean.c" +#line 2760 "SearchBoolean.c" } #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp38_ = _tag_list; @@ -2792,15 +2793,15 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med ret = _tmp45_ | _tmp48_; #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (tag); -#line 2795 "SearchBoolean.c" +#line 2796 "SearchBoolean.c" } #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tag_list); -#line 2799 "SearchBoolean.c" +#line 2800 "SearchBoolean.c" } #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (itag); -#line 2803 "SearchBoolean.c" +#line 2804 "SearchBoolean.c" } else { gboolean _tmp49_ = FALSE; const gchar* _tmp50_ = NULL; @@ -2813,11 +2814,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp51_ = search_condition_text_string_match (self, _tmp50_, NULL); #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp49_ | _tmp51_; -#line 2816 "SearchBoolean.c" +#line 2817 "SearchBoolean.c" } #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (tag_list); -#line 2820 "SearchBoolean.c" +#line 2821 "SearchBoolean.c" } #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp53_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -2827,7 +2828,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp54_) { #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp52_ = TRUE; -#line 2830 "SearchBoolean.c" +#line 2831 "SearchBoolean.c" } else { SearchConditionSearchType _tmp55_ = 0; SearchConditionSearchType _tmp56_ = 0; @@ -2837,11 +2838,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp56_ = _tmp55_; #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp52_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp56_; -#line 2840 "SearchBoolean.c" +#line 2841 "SearchBoolean.c" } #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp52_) { -#line 2844 "SearchBoolean.c" +#line 2845 "SearchBoolean.c" gchar* _tmp57_ = NULL; MediaSource* _tmp58_ = NULL; Event* _tmp59_ = NULL; @@ -2865,7 +2866,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_object_unref0 (_tmp60_); #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp61_) { -#line 2868 "SearchBoolean.c" +#line 2869 "SearchBoolean.c" MediaSource* _tmp62_ = NULL; Event* _tmp63_ = NULL; Event* _tmp64_ = NULL; @@ -2900,13 +2901,13 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp66_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tmp64_); -#line 2903 "SearchBoolean.c" +#line 2904 "SearchBoolean.c" } else { #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp57_); #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp57_ = NULL; -#line 2909 "SearchBoolean.c" +#line 2910 "SearchBoolean.c" } #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp70_ = g_strdup (_tmp57_); @@ -2926,7 +2927,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (event_name); #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp57_); -#line 2929 "SearchBoolean.c" +#line 2930 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp76_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -2936,7 +2937,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp77_) { #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp75_ = TRUE; -#line 2939 "SearchBoolean.c" +#line 2940 "SearchBoolean.c" } else { SearchConditionSearchType _tmp78_ = 0; SearchConditionSearchType _tmp79_ = 0; @@ -2946,11 +2947,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp79_ = _tmp78_; #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp75_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp79_; -#line 2949 "SearchBoolean.c" +#line 2950 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp75_) { -#line 2953 "SearchBoolean.c" +#line 2954 "SearchBoolean.c" gchar* comment = NULL; MediaSource* _tmp80_ = NULL; gchar* _tmp81_ = NULL; @@ -2965,7 +2966,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp82_ = comment; #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (NULL != _tmp82_) { -#line 2968 "SearchBoolean.c" +#line 2969 "SearchBoolean.c" gboolean _tmp83_ = FALSE; const gchar* _tmp84_ = NULL; const gchar* _tmp85_ = NULL; @@ -2996,11 +2997,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp89_); #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp87_); -#line 2999 "SearchBoolean.c" +#line 3000 "SearchBoolean.c" } #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (comment); -#line 3003 "SearchBoolean.c" +#line 3004 "SearchBoolean.c" } #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp92_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition)); @@ -3010,7 +3011,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp93_) { #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp91_ = TRUE; -#line 3013 "SearchBoolean.c" +#line 3014 "SearchBoolean.c" } else { SearchConditionSearchType _tmp94_ = 0; SearchConditionSearchType _tmp95_ = 0; @@ -3020,11 +3021,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _tmp95_ = _tmp94_; #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp91_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp95_; -#line 3023 "SearchBoolean.c" +#line 3024 "SearchBoolean.c" } #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp91_) { -#line 3027 "SearchBoolean.c" +#line 3028 "SearchBoolean.c" gboolean _tmp96_ = FALSE; const gchar* _tmp97_ = NULL; MediaSource* _tmp98_ = NULL; @@ -3063,32 +3064,32 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med _g_free0 (_tmp102_); #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp100_); -#line 3066 "SearchBoolean.c" +#line 3067 "SearchBoolean.c" } #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp107_ = self->priv->_context; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp107_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) { -#line 3072 "SearchBoolean.c" +#line 3073 "SearchBoolean.c" gboolean _tmp108_ = FALSE; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp108_ = ret; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp106_ = !_tmp108_; -#line 3078 "SearchBoolean.c" +#line 3079 "SearchBoolean.c" } else { gboolean _tmp109_ = FALSE; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp109_ = ret; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp106_ = _tmp109_; -#line 3085 "SearchBoolean.c" +#line 3086 "SearchBoolean.c" } #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp106_; #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3091 "SearchBoolean.c" +#line 3092 "SearchBoolean.c" } @@ -3103,7 +3104,7 @@ const gchar* search_condition_text_get_text (SearchConditionText* self) { result = _tmp0_; #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3106 "SearchBoolean.c" +#line 3107 "SearchBoolean.c" } @@ -3120,7 +3121,7 @@ static void search_condition_text_set_text (SearchConditionText* self, const gch _g_free0 (self->priv->_text); #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_text = _tmp1_; -#line 3123 "SearchBoolean.c" +#line 3124 "SearchBoolean.c" } @@ -3135,7 +3136,7 @@ SearchConditionTextContext search_condition_text_get_context (SearchConditionTex result = _tmp0_; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3138 "SearchBoolean.c" +#line 3139 "SearchBoolean.c" } @@ -3147,7 +3148,7 @@ static void search_condition_text_set_context (SearchConditionText* self, Search _tmp0_ = value; #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 3150 "SearchBoolean.c" +#line 3151 "SearchBoolean.c" } @@ -3159,15 +3160,15 @@ static void search_condition_text_class_init (SearchConditionTextClass * klass) #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionTextPrivate)); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_text_real_predicate; -#line 3163 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_text_real_predicate; +#line 3164 "SearchBoolean.c" } static void search_condition_text_instance_init (SearchConditionText * self) { #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_TEXT_GET_PRIVATE (self); -#line 3170 "SearchBoolean.c" +#line 3171 "SearchBoolean.c" } @@ -3179,7 +3180,7 @@ static void search_condition_text_finalize (SearchCondition* obj) { _g_free0 (self->priv->_text); #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_text_parent_class)->finalize (obj); -#line 3182 "SearchBoolean.c" +#line 3183 "SearchBoolean.c" } @@ -3201,7 +3202,7 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo switch (self) { #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS: -#line 3204 "SearchBoolean.c" +#line 3205 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3210,11 +3211,11 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo result = _tmp0_; #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3213 "SearchBoolean.c" +#line 3214 "SearchBoolean.c" } #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT: -#line 3217 "SearchBoolean.c" +#line 3218 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3223,14 +3224,14 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo result = _tmp1_; #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3226 "SearchBoolean.c" +#line 3227 "SearchBoolean.c" } default: { #line 368 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:368: unrecognized media search context enumeration " \ "value"); -#line 3232 "SearchBoolean.c" +#line 3233 "SearchBoolean.c" } } } @@ -3249,7 +3250,7 @@ SearchConditionMediaTypeContext search_condition_media_type_context_from_string result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3251 "SearchBoolean.c" +#line 3252 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3260,14 +3261,14 @@ SearchConditionMediaTypeContext search_condition_media_type_context_from_string result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3262 "SearchBoolean.c" +#line 3263 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", _tmp2_); -#line 3269 "SearchBoolean.c" +#line 3270 "SearchBoolean.c" } } } @@ -3291,7 +3292,7 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp switch (self) { #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL: -#line 3293 "SearchBoolean.c" +#line 3294 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3300,11 +3301,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp result = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3302 "SearchBoolean.c" +#line 3303 "SearchBoolean.c" } #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW: -#line 3306 "SearchBoolean.c" +#line 3307 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3313,11 +3314,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp result = _tmp1_; #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3315 "SearchBoolean.c" +#line 3316 "SearchBoolean.c" } #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO: -#line 3319 "SearchBoolean.c" +#line 3320 "SearchBoolean.c" { gchar* _tmp2_ = NULL; #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3326,14 +3327,14 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp result = _tmp2_; #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3328 "SearchBoolean.c" +#line 3329 "SearchBoolean.c" } default: { #line 401 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:401: unrecognized media search type enumeration val" \ "ue"); -#line 3334 "SearchBoolean.c" +#line 3335 "SearchBoolean.c" } } } @@ -3352,7 +3353,7 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL; #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3353 "SearchBoolean.c" +#line 3354 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3363,7 +3364,7 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW; #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3364 "SearchBoolean.c" +#line 3365 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3374,14 +3375,14 @@ SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_st result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO; #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3375 "SearchBoolean.c" +#line 3376 "SearchBoolean.c" } else { const gchar* _tmp3_ = NULL; #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", _tmp3_); -#line 3382 "SearchBoolean.c" +#line 3383 "SearchBoolean.c" } } } @@ -3421,14 +3422,14 @@ SearchConditionMediaType* search_condition_media_type_construct (GType object_ty search_condition_media_type_set_media_type (self, _tmp2_); #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 3422 "SearchBoolean.c" +#line 3423 "SearchBoolean.c" } SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) { #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_media_type_construct (TYPE_SEARCH_CONDITION_MEDIA_TYPE, search_type, context, media_type); -#line 3429 "SearchBoolean.c" +#line 3430 "SearchBoolean.c" } @@ -3446,14 +3447,14 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas switch (_tmp0_) { #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL: -#line 3447 "SearchBoolean.c" +#line 3448 "SearchBoolean.c" { MediaSource* _tmp1_ = NULL; #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = source; #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO)) { -#line 3454 "SearchBoolean.c" +#line 3455 "SearchBoolean.c" SearchConditionMediaTypeContext _tmp2_ = 0; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = self->priv->_context; @@ -3461,7 +3462,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3462 "SearchBoolean.c" +#line 3463 "SearchBoolean.c" } else { SearchConditionMediaTypeContext _tmp3_ = 0; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3470,12 +3471,12 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas result = _tmp3_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3471 "SearchBoolean.c" +#line 3472 "SearchBoolean.c" } } #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW: -#line 3476 "SearchBoolean.c" +#line 3477 "SearchBoolean.c" { gboolean _tmp4_ = FALSE; MediaSource* _tmp5_ = NULL; @@ -3483,7 +3484,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas _tmp5_ = source; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) { -#line 3484 "SearchBoolean.c" +#line 3485 "SearchBoolean.c" MediaSource* _tmp6_ = NULL; PhotoFileFormat _tmp7_ = 0; #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3492,15 +3493,15 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas _tmp7_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = _tmp7_ == PHOTO_FILE_FORMAT_RAW; -#line 3493 "SearchBoolean.c" +#line 3494 "SearchBoolean.c" } else { #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = FALSE; -#line 3497 "SearchBoolean.c" +#line 3498 "SearchBoolean.c" } #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp4_) { -#line 3501 "SearchBoolean.c" +#line 3502 "SearchBoolean.c" SearchConditionMediaTypeContext _tmp8_ = 0; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = self->priv->_context; @@ -3508,7 +3509,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas result = _tmp8_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3509 "SearchBoolean.c" +#line 3510 "SearchBoolean.c" } else { SearchConditionMediaTypeContext _tmp9_ = 0; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3517,19 +3518,19 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas result = _tmp9_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3518 "SearchBoolean.c" +#line 3519 "SearchBoolean.c" } } #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO: -#line 3523 "SearchBoolean.c" +#line 3524 "SearchBoolean.c" { MediaSource* _tmp10_ = NULL; #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = source; #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO_SOURCE)) { -#line 3530 "SearchBoolean.c" +#line 3531 "SearchBoolean.c" SearchConditionMediaTypeContext _tmp11_ = 0; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp11_ = self->priv->_context; @@ -3537,7 +3538,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas result = _tmp11_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS; #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3538 "SearchBoolean.c" +#line 3539 "SearchBoolean.c" } else { SearchConditionMediaTypeContext _tmp12_ = 0; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3546,7 +3547,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas result = _tmp12_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT; #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3547 "SearchBoolean.c" +#line 3548 "SearchBoolean.c" } } default: @@ -3554,7 +3555,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas #line 456 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:456: unrecognized media search type enumeration val" \ "ue"); -#line 3554 "SearchBoolean.c" +#line 3555 "SearchBoolean.c" } } } @@ -3571,7 +3572,7 @@ SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (Se result = _tmp0_; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3571 "SearchBoolean.c" +#line 3572 "SearchBoolean.c" } @@ -3583,7 +3584,7 @@ static void search_condition_media_type_set_media_type (SearchConditionMediaType _tmp0_ = value; #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_media_type = _tmp0_; -#line 3583 "SearchBoolean.c" +#line 3584 "SearchBoolean.c" } @@ -3598,7 +3599,7 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC result = _tmp0_; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3598 "SearchBoolean.c" +#line 3599 "SearchBoolean.c" } @@ -3610,7 +3611,7 @@ static void search_condition_media_type_set_context (SearchConditionMediaType* s _tmp0_ = value; #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 3610 "SearchBoolean.c" +#line 3611 "SearchBoolean.c" } @@ -3622,15 +3623,15 @@ static void search_condition_media_type_class_init (SearchConditionMediaTypeClas #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionMediaTypePrivate)); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_media_type_real_predicate; -#line 3623 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_media_type_real_predicate; +#line 3624 "SearchBoolean.c" } static void search_condition_media_type_instance_init (SearchConditionMediaType * self) { #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE (self); -#line 3630 "SearchBoolean.c" +#line 3631 "SearchBoolean.c" } @@ -3640,7 +3641,7 @@ static void search_condition_media_type_finalize (SearchCondition* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType); #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_media_type_parent_class)->finalize (obj); -#line 3640 "SearchBoolean.c" +#line 3641 "SearchBoolean.c" } @@ -3662,7 +3663,7 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel switch (self) { #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_FLAGGED_STATE_FLAGGED: -#line 3662 "SearchBoolean.c" +#line 3663 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3671,11 +3672,11 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel result = _tmp0_; #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3671 "SearchBoolean.c" +#line 3672 "SearchBoolean.c" } #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED: -#line 3675 "SearchBoolean.c" +#line 3676 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3684,14 +3685,14 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel result = _tmp1_; #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3684 "SearchBoolean.c" +#line 3685 "SearchBoolean.c" } default: { #line 476 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:476: unrecognized flagged search state enumeration " \ "value"); -#line 3690 "SearchBoolean.c" +#line 3691 "SearchBoolean.c" } } } @@ -3710,7 +3711,7 @@ SearchConditionFlaggedState search_condition_flagged_state_from_string (const gc result = SEARCH_CONDITION_FLAGGED_STATE_FLAGGED; #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3709 "SearchBoolean.c" +#line 3710 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3721,14 +3722,14 @@ SearchConditionFlaggedState search_condition_flagged_state_from_string (const gc result = SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED; #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3720 "SearchBoolean.c" +#line 3721 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", _tmp2_); -#line 3727 "SearchBoolean.c" +#line 3728 "SearchBoolean.c" } } } @@ -3762,14 +3763,14 @@ SearchConditionFlagged* search_condition_flagged_construct (GType object_type, S search_condition_flagged_set_state (self, _tmp1_); #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 3761 "SearchBoolean.c" +#line 3762 "SearchBoolean.c" } SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state) { #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_flagged_construct (TYPE_SEARCH_CONDITION_FLAGGED, search_type, state); -#line 3768 "SearchBoolean.c" +#line 3769 "SearchBoolean.c" } @@ -3785,7 +3786,7 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, _tmp0_ = self->priv->_state; #line 502 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_ == SEARCH_CONDITION_FLAGGED_STATE_FLAGGED) { -#line 3784 "SearchBoolean.c" +#line 3785 "SearchBoolean.c" MediaSource* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3796,14 +3797,14 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, result = _tmp2_; #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3795 "SearchBoolean.c" +#line 3796 "SearchBoolean.c" } else { SearchConditionFlaggedState _tmp3_ = 0; #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_state; #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp3_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) { -#line 3802 "SearchBoolean.c" +#line 3803 "SearchBoolean.c" MediaSource* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3814,11 +3815,11 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base, result = !_tmp5_; #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3813 "SearchBoolean.c" +#line 3814 "SearchBoolean.c" } else { #line 507 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:507: unrecognized flagged search state"); -#line 3817 "SearchBoolean.c" +#line 3818 "SearchBoolean.c" } } } @@ -3835,7 +3836,7 @@ SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionF result = _tmp0_; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3834 "SearchBoolean.c" +#line 3835 "SearchBoolean.c" } @@ -3847,7 +3848,7 @@ static void search_condition_flagged_set_state (SearchConditionFlagged* self, Se _tmp0_ = value; #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_state = _tmp0_; -#line 3846 "SearchBoolean.c" +#line 3847 "SearchBoolean.c" } @@ -3859,15 +3860,15 @@ static void search_condition_flagged_class_init (SearchConditionFlaggedClass * k #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionFlaggedPrivate)); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_flagged_real_predicate; -#line 3859 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_flagged_real_predicate; +#line 3860 "SearchBoolean.c" } static void search_condition_flagged_instance_init (SearchConditionFlagged * self) { #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_FLAGGED_GET_PRIVATE (self); -#line 3866 "SearchBoolean.c" +#line 3867 "SearchBoolean.c" } @@ -3877,7 +3878,7 @@ static void search_condition_flagged_finalize (SearchCondition* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged); #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_flagged_parent_class)->finalize (obj); -#line 3876 "SearchBoolean.c" +#line 3877 "SearchBoolean.c" } @@ -3899,7 +3900,7 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte switch (self) { #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS: -#line 3898 "SearchBoolean.c" +#line 3899 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3908,11 +3909,11 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte result = _tmp0_; #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3907 "SearchBoolean.c" +#line 3908 "SearchBoolean.c" } #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO: -#line 3911 "SearchBoolean.c" +#line 3912 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3921,14 +3922,14 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte result = _tmp1_; #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3920 "SearchBoolean.c" +#line 3921 "SearchBoolean.c" } default: { #line 528 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:528: unrecognized modified search context enumerati" \ "on value"); -#line 3926 "SearchBoolean.c" +#line 3927 "SearchBoolean.c" } } } @@ -3947,7 +3948,7 @@ SearchConditionModifiedContext search_condition_modified_context_from_string (co result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS; #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3945 "SearchBoolean.c" +#line 3946 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3958,14 +3959,14 @@ SearchConditionModifiedContext search_condition_modified_context_from_string (co result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO; #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3956 "SearchBoolean.c" +#line 3957 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = str; #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", _tmp2_); -#line 3963 "SearchBoolean.c" +#line 3964 "SearchBoolean.c" } } } @@ -3989,7 +3990,7 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s switch (self) { #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_STATE_MODIFIED: -#line 3987 "SearchBoolean.c" +#line 3988 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -3998,11 +3999,11 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s result = _tmp0_; #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 3996 "SearchBoolean.c" +#line 3997 "SearchBoolean.c" } #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES: -#line 4000 "SearchBoolean.c" +#line 4001 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4011,11 +4012,11 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s result = _tmp1_; #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4009 "SearchBoolean.c" +#line 4010 "SearchBoolean.c" } #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES: -#line 4013 "SearchBoolean.c" +#line 4014 "SearchBoolean.c" { gchar* _tmp2_ = NULL; #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4024,14 +4025,14 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s result = _tmp2_; #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4022 "SearchBoolean.c" +#line 4023 "SearchBoolean.c" } default: { #line 561 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:561: unrecognized modified search state enumeration" \ " value"); -#line 4028 "SearchBoolean.c" +#line 4029 "SearchBoolean.c" } } } @@ -4050,7 +4051,7 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const result = SEARCH_CONDITION_MODIFIED_STATE_MODIFIED; #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4047 "SearchBoolean.c" +#line 4048 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4061,7 +4062,7 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const result = SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES; #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4058 "SearchBoolean.c" +#line 4059 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4072,14 +4073,14 @@ SearchConditionModifiedState search_condition_modified_state_from_string (const result = SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES; #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4069 "SearchBoolean.c" +#line 4070 "SearchBoolean.c" } else { const gchar* _tmp3_ = NULL; #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", _tmp3_); -#line 4076 "SearchBoolean.c" +#line 4077 "SearchBoolean.c" } } } @@ -4119,14 +4120,14 @@ SearchConditionModified* search_condition_modified_construct (GType object_type, search_condition_modified_set_state (self, _tmp2_); #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4116 "SearchBoolean.c" +#line 4117 "SearchBoolean.c" } SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) { #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_modified_construct (TYPE_SEARCH_CONDITION_MODIFIED, search_type, context, state); -#line 4123 "SearchBoolean.c" +#line 4124 "SearchBoolean.c" } @@ -4160,13 +4161,13 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _g_object_unref0 (photo); #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4157 "SearchBoolean.c" +#line 4158 "SearchBoolean.c" } #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_state; #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp3_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) { -#line 4163 "SearchBoolean.c" +#line 4164 "SearchBoolean.c" gboolean _tmp4_ = FALSE; Photo* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; @@ -4178,7 +4179,7 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, if (_tmp6_) { #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = TRUE; -#line 4175 "SearchBoolean.c" +#line 4176 "SearchBoolean.c" } else { Photo* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; @@ -4188,18 +4189,18 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _tmp8_ = photo_has_editable (_tmp7_); #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = _tmp8_; -#line 4185 "SearchBoolean.c" +#line 4186 "SearchBoolean.c" } #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" match = _tmp4_; -#line 4189 "SearchBoolean.c" +#line 4190 "SearchBoolean.c" } else { SearchConditionModifiedState _tmp9_ = 0; #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = self->priv->_state; #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp9_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) { -#line 4196 "SearchBoolean.c" +#line 4197 "SearchBoolean.c" Photo* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4208,14 +4209,14 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _tmp11_ = photo_has_transformations (_tmp10_); #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" match = _tmp11_; -#line 4205 "SearchBoolean.c" +#line 4206 "SearchBoolean.c" } else { SearchConditionModifiedState _tmp12_ = 0; #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = self->priv->_state; #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp12_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) { -#line 4212 "SearchBoolean.c" +#line 4213 "SearchBoolean.c" Photo* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4224,11 +4225,11 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _tmp14_ = photo_has_editable (_tmp13_); #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" match = _tmp14_; -#line 4221 "SearchBoolean.c" +#line 4222 "SearchBoolean.c" } else { #line 607 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:607: unrecognized modified search state"); -#line 4225 "SearchBoolean.c" +#line 4226 "SearchBoolean.c" } } } @@ -4236,7 +4237,7 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _tmp15_ = match; #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp15_) { -#line 4233 "SearchBoolean.c" +#line 4234 "SearchBoolean.c" SearchConditionModifiedContext _tmp16_ = 0; #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp16_ = self->priv->_context; @@ -4246,7 +4247,7 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _g_object_unref0 (photo); #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4243 "SearchBoolean.c" +#line 4244 "SearchBoolean.c" } else { SearchConditionModifiedContext _tmp17_ = 0; #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4257,11 +4258,11 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base, _g_object_unref0 (photo); #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4254 "SearchBoolean.c" +#line 4255 "SearchBoolean.c" } #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (photo); -#line 4258 "SearchBoolean.c" +#line 4259 "SearchBoolean.c" } @@ -4276,7 +4277,7 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio result = _tmp0_; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4273 "SearchBoolean.c" +#line 4274 "SearchBoolean.c" } @@ -4288,7 +4289,7 @@ static void search_condition_modified_set_state (SearchConditionModified* self, _tmp0_ = value; #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_state = _tmp0_; -#line 4285 "SearchBoolean.c" +#line 4286 "SearchBoolean.c" } @@ -4303,7 +4304,7 @@ SearchConditionModifiedContext search_condition_modified_get_context (SearchCond result = _tmp0_; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4300 "SearchBoolean.c" +#line 4301 "SearchBoolean.c" } @@ -4315,7 +4316,7 @@ static void search_condition_modified_set_context (SearchConditionModified* self _tmp0_ = value; #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 4312 "SearchBoolean.c" +#line 4313 "SearchBoolean.c" } @@ -4327,15 +4328,15 @@ static void search_condition_modified_class_init (SearchConditionModifiedClass * #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionModifiedPrivate)); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_modified_real_predicate; -#line 4325 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_modified_real_predicate; +#line 4326 "SearchBoolean.c" } static void search_condition_modified_instance_init (SearchConditionModified * self) { #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_MODIFIED_GET_PRIVATE (self); -#line 4332 "SearchBoolean.c" +#line 4333 "SearchBoolean.c" } @@ -4345,7 +4346,7 @@ static void search_condition_modified_finalize (SearchCondition* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified); #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_modified_parent_class)->finalize (obj); -#line 4342 "SearchBoolean.c" +#line 4343 "SearchBoolean.c" } @@ -4367,7 +4368,7 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s switch (self) { #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER: -#line 4364 "SearchBoolean.c" +#line 4365 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4376,11 +4377,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s result = _tmp0_; #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4373 "SearchBoolean.c" +#line 4374 "SearchBoolean.c" } #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_ONLY: -#line 4377 "SearchBoolean.c" +#line 4378 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4389,11 +4390,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s result = _tmp1_; #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4386 "SearchBoolean.c" +#line 4387 "SearchBoolean.c" } #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER: -#line 4390 "SearchBoolean.c" +#line 4391 "SearchBoolean.c" { gchar* _tmp2_ = NULL; #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4402,14 +4403,14 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s result = _tmp2_; #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4399 "SearchBoolean.c" +#line 4400 "SearchBoolean.c" } default: { #line 636 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:636: unrecognized rating search context enumeration" \ " value"); -#line 4405 "SearchBoolean.c" +#line 4406 "SearchBoolean.c" } } } @@ -4428,7 +4429,7 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const result = SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER; #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4424 "SearchBoolean.c" +#line 4425 "SearchBoolean.c" } else { const gchar* _tmp1_ = NULL; #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4439,7 +4440,7 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const result = SEARCH_CONDITION_RATING_CONTEXT_ONLY; #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4435 "SearchBoolean.c" +#line 4436 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4450,14 +4451,14 @@ SearchConditionRatingContext search_condition_rating_context_from_string (const result = SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER; #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4446 "SearchBoolean.c" +#line 4447 "SearchBoolean.c" } else { const gchar* _tmp3_ = NULL; #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = str; #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", _tmp3_); -#line 4453 "SearchBoolean.c" +#line 4454 "SearchBoolean.c" } } } @@ -4497,14 +4498,14 @@ SearchConditionRating* search_condition_rating_construct (GType object_type, Sea search_condition_rating_set_context (self, _tmp2_); #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4493 "SearchBoolean.c" +#line 4494 "SearchBoolean.c" } SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) { #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_rating_construct (TYPE_SEARCH_CONDITION_RATING, search_type, rating, context); -#line 4500 "SearchBoolean.c" +#line 4501 "SearchBoolean.c" } @@ -4529,7 +4530,7 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M _tmp2_ = self->priv->_context; #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) { -#line 4525 "SearchBoolean.c" +#line 4526 "SearchBoolean.c" Rating _tmp3_ = 0; Rating _tmp4_ = 0; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4540,14 +4541,14 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M result = _tmp3_ >= _tmp4_; #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4536 "SearchBoolean.c" +#line 4537 "SearchBoolean.c" } else { SearchConditionRatingContext _tmp5_ = 0; #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = self->priv->_context; #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp5_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) { -#line 4543 "SearchBoolean.c" +#line 4544 "SearchBoolean.c" Rating _tmp6_ = 0; Rating _tmp7_ = 0; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4558,14 +4559,14 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M result = _tmp6_ == _tmp7_; #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4554 "SearchBoolean.c" +#line 4555 "SearchBoolean.c" } else { SearchConditionRatingContext _tmp8_ = 0; #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = self->priv->_context; #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp8_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) { -#line 4561 "SearchBoolean.c" +#line 4562 "SearchBoolean.c" Rating _tmp9_ = 0; Rating _tmp10_ = 0; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4576,11 +4577,11 @@ static gboolean search_condition_rating_real_predicate (SearchCondition* base, M result = _tmp9_ <= _tmp10_; #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4572 "SearchBoolean.c" +#line 4573 "SearchBoolean.c" } else { #line 677 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:677: unknown rating search context"); -#line 4576 "SearchBoolean.c" +#line 4577 "SearchBoolean.c" } } } @@ -4598,7 +4599,7 @@ Rating search_condition_rating_get_rating (SearchConditionRating* self) { result = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4594 "SearchBoolean.c" +#line 4595 "SearchBoolean.c" } @@ -4610,7 +4611,7 @@ static void search_condition_rating_set_rating (SearchConditionRating* self, Rat _tmp0_ = value; #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_rating = _tmp0_; -#line 4606 "SearchBoolean.c" +#line 4607 "SearchBoolean.c" } @@ -4625,7 +4626,7 @@ SearchConditionRatingContext search_condition_rating_get_context (SearchConditio result = _tmp0_; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4621 "SearchBoolean.c" +#line 4622 "SearchBoolean.c" } @@ -4637,7 +4638,7 @@ static void search_condition_rating_set_context (SearchConditionRating* self, Se _tmp0_ = value; #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 4633 "SearchBoolean.c" +#line 4634 "SearchBoolean.c" } @@ -4649,15 +4650,15 @@ static void search_condition_rating_class_init (SearchConditionRatingClass * kla #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionRatingPrivate)); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_rating_real_predicate; -#line 4646 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_rating_real_predicate; +#line 4647 "SearchBoolean.c" } static void search_condition_rating_instance_init (SearchConditionRating * self) { #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_RATING_GET_PRIVATE (self); -#line 4653 "SearchBoolean.c" +#line 4654 "SearchBoolean.c" } @@ -4667,7 +4668,7 @@ static void search_condition_rating_finalize (SearchCondition* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating); #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_rating_parent_class)->finalize (obj); -#line 4663 "SearchBoolean.c" +#line 4664 "SearchBoolean.c" } @@ -4689,7 +4690,7 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) switch (self) { #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_EXACT: -#line 4685 "SearchBoolean.c" +#line 4686 "SearchBoolean.c" { gchar* _tmp0_ = NULL; #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4698,11 +4699,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp0_; #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4694 "SearchBoolean.c" +#line 4695 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_AFTER: -#line 4698 "SearchBoolean.c" +#line 4699 "SearchBoolean.c" { gchar* _tmp1_ = NULL; #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4711,11 +4712,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp1_; #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4707 "SearchBoolean.c" +#line 4708 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BEFORE: -#line 4711 "SearchBoolean.c" +#line 4712 "SearchBoolean.c" { gchar* _tmp2_ = NULL; #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4724,11 +4725,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp2_; #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4720 "SearchBoolean.c" +#line 4721 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN: -#line 4724 "SearchBoolean.c" +#line 4725 "SearchBoolean.c" { gchar* _tmp3_ = NULL; #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4737,11 +4738,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp3_; #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4733 "SearchBoolean.c" +#line 4734 "SearchBoolean.c" } #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET: -#line 4737 "SearchBoolean.c" +#line 4738 "SearchBoolean.c" { gchar* _tmp4_ = NULL; #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4750,14 +4751,14 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self) result = _tmp4_; #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4746 "SearchBoolean.c" +#line 4747 "SearchBoolean.c" } default: { #line 709 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:709: unrecognized date search context enumeration v" \ "alue"); -#line 4752 "SearchBoolean.c" +#line 4753 "SearchBoolean.c" } } } @@ -4777,7 +4778,7 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_EXACT; #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4772 "SearchBoolean.c" +#line 4773 "SearchBoolean.c" } #line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = str; @@ -4787,7 +4788,7 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_AFTER; #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4782 "SearchBoolean.c" +#line 4783 "SearchBoolean.c" } else { const gchar* _tmp2_ = NULL; #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4798,7 +4799,7 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_BEFORE; #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4793 "SearchBoolean.c" +#line 4794 "SearchBoolean.c" } else { const gchar* _tmp3_ = NULL; #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4809,7 +4810,7 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_BETWEEN; #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4804 "SearchBoolean.c" +#line 4805 "SearchBoolean.c" } else { const gchar* _tmp4_ = NULL; #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4820,14 +4821,14 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha result = SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4815 "SearchBoolean.c" +#line 4816 "SearchBoolean.c" } else { const gchar* _tmp5_ = NULL; #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = str; #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", _tmp5_); -#line 4822 "SearchBoolean.c" +#line 4823 "SearchBoolean.c" } } } @@ -4873,7 +4874,7 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC if (_tmp3_ != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) { #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = TRUE; -#line 4868 "SearchBoolean.c" +#line 4869 "SearchBoolean.c" } else { GDateTime* _tmp4_ = NULL; GDateTime* _tmp5_ = NULL; @@ -4886,11 +4887,11 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC _tmp6_ = g_date_time_compare (_tmp4_, _tmp5_); #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = _tmp6_ >= 1; -#line 4881 "SearchBoolean.c" +#line 4882 "SearchBoolean.c" } #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_) { -#line 4885 "SearchBoolean.c" +#line 4886 "SearchBoolean.c" GDateTime* _tmp7_ = NULL; GDateTime* _tmp8_ = NULL; #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -4901,7 +4902,7 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC _tmp8_ = date_two; #line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_date_set_date_two (self, _tmp8_); -#line 4896 "SearchBoolean.c" +#line 4897 "SearchBoolean.c" } else { GDateTime* _tmp9_ = NULL; GDateTime* _tmp10_ = NULL; @@ -4913,18 +4914,18 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC _tmp10_ = date_one; #line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search_condition_date_set_date_two (self, _tmp10_); -#line 4908 "SearchBoolean.c" +#line 4909 "SearchBoolean.c" } #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 4912 "SearchBoolean.c" +#line 4913 "SearchBoolean.c" } SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) { #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return search_condition_date_construct (TYPE_SEARCH_CONDITION_DATE, search_type, context, date_one, date_two); -#line 4919 "SearchBoolean.c" +#line 4920 "SearchBoolean.c" } @@ -4953,7 +4954,7 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp2_ = exposure_time; #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp2_ == ((time_t) 0)) { -#line 4948 "SearchBoolean.c" +#line 4949 "SearchBoolean.c" SearchConditionDateContext _tmp3_ = 0; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = self->priv->_context; @@ -4961,7 +4962,7 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med result = _tmp3_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET; #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 4956 "SearchBoolean.c" +#line 4957 "SearchBoolean.c" } #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp4_ = exposure_time; @@ -4975,7 +4976,7 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med switch (_tmp6_) { #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_EXACT: -#line 4970 "SearchBoolean.c" +#line 4971 "SearchBoolean.c" { GDateTime* second = NULL; GDateTime* _tmp7_ = NULL; @@ -4998,7 +4999,7 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp12_ = g_date_time_compare (_tmp10_, _tmp11_); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp12_ >= 0) { -#line 4993 "SearchBoolean.c" +#line 4994 "SearchBoolean.c" GDateTime* _tmp13_ = NULL; GDateTime* _tmp14_ = NULL; gint _tmp15_ = 0; @@ -5010,11 +5011,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp15_ = g_date_time_compare (_tmp13_, _tmp14_); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = _tmp15_ < 0; -#line 5005 "SearchBoolean.c" +#line 5006 "SearchBoolean.c" } else { #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp9_ = FALSE; -#line 5009 "SearchBoolean.c" +#line 5010 "SearchBoolean.c" } #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp9_; @@ -5024,11 +5025,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5019 "SearchBoolean.c" +#line 5020 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_AFTER: -#line 5023 "SearchBoolean.c" +#line 5024 "SearchBoolean.c" { GDateTime* _tmp16_ = NULL; GDateTime* _tmp17_ = NULL; @@ -5045,11 +5046,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5040 "SearchBoolean.c" +#line 5041 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BEFORE: -#line 5044 "SearchBoolean.c" +#line 5045 "SearchBoolean.c" { GDateTime* _tmp19_ = NULL; GDateTime* _tmp20_ = NULL; @@ -5066,11 +5067,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5061 "SearchBoolean.c" +#line 5062 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN: -#line 5065 "SearchBoolean.c" +#line 5066 "SearchBoolean.c" { GDateTime* second = NULL; GDateTime* _tmp22_ = NULL; @@ -5093,7 +5094,7 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp27_ = g_date_time_compare (_tmp25_, _tmp26_); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp27_ >= 0) { -#line 5088 "SearchBoolean.c" +#line 5089 "SearchBoolean.c" GDateTime* _tmp28_ = NULL; GDateTime* _tmp29_ = NULL; gint _tmp30_ = 0; @@ -5105,11 +5106,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _tmp30_ = g_date_time_compare (_tmp28_, _tmp29_); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = _tmp30_ < 0; -#line 5100 "SearchBoolean.c" +#line 5101 "SearchBoolean.c" } else { #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp24_ = FALSE; -#line 5104 "SearchBoolean.c" +#line 5105 "SearchBoolean.c" } #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp24_; @@ -5119,11 +5120,11 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5114 "SearchBoolean.c" +#line 5115 "SearchBoolean.c" } #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET: -#line 5118 "SearchBoolean.c" +#line 5119 "SearchBoolean.c" { #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; @@ -5131,19 +5132,19 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med _g_date_time_unref0 (dt); #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5126 "SearchBoolean.c" +#line 5127 "SearchBoolean.c" } default: { #line 781 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_error ("SearchBoolean.vala:781: unrecognized date search context enumeration v" \ "alue"); -#line 5132 "SearchBoolean.c" +#line 5133 "SearchBoolean.c" } } #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_date_time_unref0 (dt); -#line 5137 "SearchBoolean.c" +#line 5138 "SearchBoolean.c" } @@ -5158,14 +5159,14 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) { result = _tmp0_; #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5152 "SearchBoolean.c" +#line 5153 "SearchBoolean.c" } static gpointer _g_date_time_ref0 (gpointer self) { #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? g_date_time_ref (self) : NULL; -#line 5159 "SearchBoolean.c" +#line 5160 "SearchBoolean.c" } @@ -5182,7 +5183,7 @@ static void search_condition_date_set_date_one (SearchConditionDate* self, GDate _g_date_time_unref0 (self->priv->_date_one); #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_date_one = _tmp1_; -#line 5176 "SearchBoolean.c" +#line 5177 "SearchBoolean.c" } @@ -5197,7 +5198,7 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) { result = _tmp0_; #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5191 "SearchBoolean.c" +#line 5192 "SearchBoolean.c" } @@ -5214,7 +5215,7 @@ static void search_condition_date_set_date_two (SearchConditionDate* self, GDate _g_date_time_unref0 (self->priv->_date_two); #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_date_two = _tmp1_; -#line 5208 "SearchBoolean.c" +#line 5209 "SearchBoolean.c" } @@ -5229,7 +5230,7 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat result = _tmp0_; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5223 "SearchBoolean.c" +#line 5224 "SearchBoolean.c" } @@ -5241,7 +5242,7 @@ static void search_condition_date_set_context (SearchConditionDate* self, Search _tmp0_ = value; #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->_context = _tmp0_; -#line 5235 "SearchBoolean.c" +#line 5236 "SearchBoolean.c" } @@ -5253,15 +5254,15 @@ static void search_condition_date_class_init (SearchConditionDateClass * klass) #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SearchConditionDatePrivate)); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((SearchConditionClass *) klass)->predicate = search_condition_date_real_predicate; -#line 5248 "SearchBoolean.c" + ((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_date_real_predicate; +#line 5249 "SearchBoolean.c" } static void search_condition_date_instance_init (SearchConditionDate * self) { #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SEARCH_CONDITION_DATE_GET_PRIVATE (self); -#line 5255 "SearchBoolean.c" +#line 5256 "SearchBoolean.c" } @@ -5275,7 +5276,7 @@ static void search_condition_date_finalize (SearchCondition* obj) { _g_date_time_unref0 (self->priv->_date_two); #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" SEARCH_CONDITION_CLASS (search_condition_date_parent_class)->finalize (obj); -#line 5269 "SearchBoolean.c" +#line 5270 "SearchBoolean.c" } @@ -5294,7 +5295,7 @@ GType search_condition_date_get_type (void) { static gpointer _saved_search_row_ref0 (gpointer self) { #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? saved_search_row_ref (self) : NULL; -#line 5288 "SearchBoolean.c" +#line 5289 "SearchBoolean.c" } @@ -5319,14 +5320,14 @@ SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gin self->priv->row = _tmp2_; #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 5313 "SearchBoolean.c" +#line 5314 "SearchBoolean.c" } SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id) { #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return saved_search_construct (TYPE_SAVED_SEARCH, row, object_id); -#line 5320 "SearchBoolean.c" +#line 5321 "SearchBoolean.c" } @@ -5348,7 +5349,7 @@ static gchar* saved_search_real_get_name (DataObject* base) { result = _tmp2_; #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5342 "SearchBoolean.c" +#line 5343 "SearchBoolean.c" } @@ -5375,7 +5376,7 @@ static gchar* saved_search_real_to_string (DataObject* base) { result = _tmp3_; #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5369 "SearchBoolean.c" +#line 5370 "SearchBoolean.c" } @@ -5391,7 +5392,7 @@ static gchar* saved_search_real_get_typename (DataSource* base) { result = _tmp0_; #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5385 "SearchBoolean.c" +#line 5386 "SearchBoolean.c" } @@ -5408,7 +5409,7 @@ void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) *result = _tmp1_; #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5402 "SearchBoolean.c" +#line 5403 "SearchBoolean.c" } @@ -5427,7 +5428,7 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5421 "SearchBoolean.c" +#line 5422 "SearchBoolean.c" } @@ -5458,7 +5459,7 @@ gint saved_search_compare_names (void* a, void* b) { result = _tmp4_; #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5452 "SearchBoolean.c" +#line 5453 "SearchBoolean.c" } @@ -5480,7 +5481,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { if (SEARCH_OPERATOR_ALL == _tmp2_) { #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; -#line 5474 "SearchBoolean.c" +#line 5475 "SearchBoolean.c" } else { SavedSearchRow* _tmp3_ = NULL; SearchOperator _tmp4_ = 0; @@ -5490,17 +5491,17 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp4_ = _tmp3_->operator; #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = SEARCH_OPERATOR_NONE == _tmp4_; -#line 5484 "SearchBoolean.c" +#line 5485 "SearchBoolean.c" } #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_) { #line 830 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = TRUE; -#line 5490 "SearchBoolean.c" +#line 5491 "SearchBoolean.c" } else { #line 832 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = FALSE; -#line 5494 "SearchBoolean.c" +#line 5495 "SearchBoolean.c" } { GeeList* _c_list = NULL; @@ -5532,7 +5533,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _c_index = -1; #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 5526 "SearchBoolean.c" +#line 5527 "SearchBoolean.c" gint _tmp11_ = 0; gint _tmp12_ = 0; gint _tmp13_ = 0; @@ -5554,7 +5555,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { if (!(_tmp12_ < _tmp13_)) { #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 5548 "SearchBoolean.c" +#line 5549 "SearchBoolean.c" } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp14_ = _c_list; @@ -5570,7 +5571,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp18_ = _tmp17_->operator; #line 835 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_ALL == _tmp18_) { -#line 5564 "SearchBoolean.c" +#line 5565 "SearchBoolean.c" gboolean _tmp19_ = FALSE; SearchCondition* _tmp20_ = NULL; MediaSource* _tmp21_ = NULL; @@ -5585,7 +5586,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp22_ = search_condition_predicate (_tmp20_, _tmp21_); #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp19_ & _tmp22_; -#line 5579 "SearchBoolean.c" +#line 5580 "SearchBoolean.c" } else { SavedSearchRow* _tmp23_ = NULL; SearchOperator _tmp24_ = 0; @@ -5595,7 +5596,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp24_ = _tmp23_->operator; #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_ANY == _tmp24_) { -#line 5589 "SearchBoolean.c" +#line 5590 "SearchBoolean.c" gboolean _tmp25_ = FALSE; SearchCondition* _tmp26_ = NULL; MediaSource* _tmp27_ = NULL; @@ -5610,7 +5611,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp28_ = search_condition_predicate (_tmp26_, _tmp27_); #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp25_ | _tmp28_; -#line 5604 "SearchBoolean.c" +#line 5605 "SearchBoolean.c" } else { SavedSearchRow* _tmp29_ = NULL; SearchOperator _tmp30_ = 0; @@ -5620,7 +5621,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp30_ = _tmp29_->operator; #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (SEARCH_OPERATOR_NONE == _tmp30_) { -#line 5614 "SearchBoolean.c" +#line 5615 "SearchBoolean.c" gboolean _tmp31_ = FALSE; SearchCondition* _tmp32_ = NULL; MediaSource* _tmp33_ = NULL; @@ -5635,23 +5636,23 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) { _tmp34_ = search_condition_predicate (_tmp32_, _tmp33_); #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ret = _tmp31_ & (!_tmp34_); -#line 5629 "SearchBoolean.c" +#line 5630 "SearchBoolean.c" } } } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _search_condition_unref0 (c); -#line 5635 "SearchBoolean.c" +#line 5636 "SearchBoolean.c" } #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_c_list); -#line 5639 "SearchBoolean.c" +#line 5640 "SearchBoolean.c" } #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = ret; #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5645 "SearchBoolean.c" +#line 5646 "SearchBoolean.c" } @@ -5663,7 +5664,7 @@ void saved_search_reconstitute (SavedSearch* self) { GError * _inner_error_ = NULL; #line 845 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (self)); -#line 5657 "SearchBoolean.c" +#line 5658 "SearchBoolean.c" { SavedSearchID _tmp0_ = {0}; SavedSearchDBTable* _tmp1_ = NULL; @@ -5690,7 +5691,7 @@ void saved_search_reconstitute (SavedSearch* self) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5684 "SearchBoolean.c" +#line 5685 "SearchBoolean.c" goto __catch77_database_error; } #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5699,13 +5700,13 @@ void saved_search_reconstitute (SavedSearch* self) { g_clear_error (&_inner_error_); #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5693 "SearchBoolean.c" +#line 5694 "SearchBoolean.c" } #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_ = self->priv->row; #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp6_->search_id = _tmp0_; -#line 5699 "SearchBoolean.c" +#line 5700 "SearchBoolean.c" } goto __finally77; __catch77_database_error: @@ -5722,7 +5723,7 @@ void saved_search_reconstitute (SavedSearch* self) { app_window_database_error (_tmp7_); #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 5716 "SearchBoolean.c" +#line 5717 "SearchBoolean.c" } __finally77: #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5733,7 +5734,7 @@ void saved_search_reconstitute (SavedSearch* self) { g_clear_error (&_inner_error_); #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 5727 "SearchBoolean.c" +#line 5728 "SearchBoolean.c" } #line 852 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = saved_search_table_get_instance (); @@ -5751,7 +5752,7 @@ void saved_search_reconstitute (SavedSearch* self) { g_debug ("SearchBoolean.vala:853: Reconstituted %s", _tmp11_); #line 853 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (_tmp11_); -#line 5745 "SearchBoolean.c" +#line 5746 "SearchBoolean.c" } @@ -5764,15 +5765,15 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { const gchar* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; - SavedSearchTable* _tmp13_ = NULL; - SavedSearchTable* _tmp14_ = NULL; - SavedSearchRow* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - SavedSearchTable* _tmp18_ = NULL; - SavedSearchTable* _tmp19_ = NULL; - LibraryWindow* _tmp20_ = NULL; - LibraryWindow* _tmp21_ = NULL; + SavedSearchTable* _tmp15_ = NULL; + SavedSearchTable* _tmp16_ = NULL; + SavedSearchRow* _tmp17_ = NULL; + const gchar* _tmp18_ = NULL; + gchar* _tmp19_ = NULL; + SavedSearchTable* _tmp20_ = NULL; + SavedSearchTable* _tmp21_ = NULL; + LibraryWindow* _tmp22_ = NULL; + LibraryWindow* _tmp23_ = NULL; GError * _inner_error_ = NULL; #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE); @@ -5788,7 +5789,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { result = FALSE; #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5782 "SearchBoolean.c" +#line 5783 "SearchBoolean.c" } #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = saved_search_table_get_instance (); @@ -5808,7 +5809,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { result = FALSE; #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5802 "SearchBoolean.c" +#line 5803 "SearchBoolean.c" } { SavedSearchDBTable* _tmp7_ = NULL; @@ -5832,9 +5833,11 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { _database_table_unref0 (_tmp8_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5827 "SearchBoolean.c" + gboolean _tmp12_ = FALSE; #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5828 "SearchBoolean.c" +#line 5831 "SearchBoolean.c" goto __catch78_database_error; } #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -5842,81 +5845,83 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) { #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_clear_error (&_inner_error_); #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - return FALSE; -#line 5837 "SearchBoolean.c" + return _tmp12_; +#line 5840 "SearchBoolean.c" } } goto __finally78; __catch78_database_error: { GError* err = NULL; - GError* _tmp12_ = NULL; + GError* _tmp13_ = NULL; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" err = _inner_error_; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _inner_error_ = NULL; #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp12_ = err; + _tmp13_ = err; #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - app_window_database_error (_tmp12_); + app_window_database_error (_tmp13_); #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = FALSE; #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5859 "SearchBoolean.c" +#line 5862 "SearchBoolean.c" } __finally78: #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 5867 "SearchBoolean.c" + gboolean _tmp14_ = FALSE; #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_clear_error (&_inner_error_); #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - return FALSE; -#line 5870 "SearchBoolean.c" + return _tmp14_; +#line 5875 "SearchBoolean.c" } #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp13_ = saved_search_table_get_instance (); + _tmp15_ = saved_search_table_get_instance (); #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp14_ = _tmp13_; + _tmp16_ = _tmp15_; #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_table_remove_from_map (_tmp14_, self); + saved_search_table_remove_from_map (_tmp16_, self); #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _saved_search_table_unref0 (_tmp14_); + _saved_search_table_unref0 (_tmp16_); #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_ = self->priv->row; + _tmp17_ = self->priv->row; #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp16_ = new_name; + _tmp18_ = new_name; #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp17_ = g_strdup (_tmp16_); + _tmp19_ = g_strdup (_tmp18_); #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_free0 (_tmp15_->name); + _g_free0 (_tmp17_->name); #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp15_->name = _tmp17_; + _tmp17_->name = _tmp19_; #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp18_ = saved_search_table_get_instance (); + _tmp20_ = saved_search_table_get_instance (); #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp19_ = _tmp18_; + _tmp21_ = _tmp20_; #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - saved_search_table_add_to_map (_tmp19_, self); + saved_search_table_add_to_map (_tmp21_, self); #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _saved_search_table_unref0 (_tmp19_); + _saved_search_table_unref0 (_tmp21_); #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp20_ = library_window_get_app (); + _tmp22_ = library_window_get_app (); #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp21_ = _tmp20_; + _tmp23_ = _tmp22_; #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - library_window_switch_to_saved_search (_tmp21_, self); + library_window_switch_to_saved_search (_tmp23_, self); #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp23_); #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = TRUE; #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5910 "SearchBoolean.c" +#line 5915 "SearchBoolean.c" } @@ -5940,7 +5945,7 @@ GeeList* saved_search_get_conditions (SavedSearch* self) { result = _tmp3_; #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5934 "SearchBoolean.c" +#line 5939 "SearchBoolean.c" } @@ -5958,7 +5963,7 @@ SearchOperator saved_search_get_operator (SavedSearch* self) { result = _tmp1_; #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 5952 "SearchBoolean.c" +#line 5957 "SearchBoolean.c" } @@ -5968,23 +5973,23 @@ static void saved_search_class_init (SavedSearchClass * klass) { #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_class_add_private (klass, sizeof (SavedSearchPrivate)); #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataObjectClass *) klass)->get_name = saved_search_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) saved_search_real_get_name; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataObjectClass *) klass)->to_string = saved_search_real_to_string; + ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) saved_search_real_to_string; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataSourceClass *) klass)->get_typename = saved_search_real_get_typename; + ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) saved_search_real_get_typename; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - ((DataSourceClass *) klass)->get_instance_id = saved_search_real_get_instance_id; + ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) saved_search_real_get_instance_id; #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" G_OBJECT_CLASS (klass)->finalize = saved_search_finalize; -#line 5971 "SearchBoolean.c" +#line 5976 "SearchBoolean.c" } static void saved_search_instance_init (SavedSearch * self) { #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SAVED_SEARCH_GET_PRIVATE (self); -#line 5978 "SearchBoolean.c" +#line 5983 "SearchBoolean.c" } @@ -5996,7 +6001,7 @@ static void saved_search_finalize (GObject* obj) { _saved_search_row_unref0 (self->priv->row); #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" G_OBJECT_CLASS (saved_search_parent_class)->finalize (obj); -#line 5990 "SearchBoolean.c" +#line 5995 "SearchBoolean.c" } @@ -6017,7 +6022,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { GError * _inner_error_ = NULL; #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self = (SavedSearchTable*) g_type_create_instance (object_type); -#line 6011 "SearchBoolean.c" +#line 6016 "SearchBoolean.c" { GeeList* _tmp0_ = NULL; SavedSearchDBTable* _tmp1_ = NULL; @@ -6040,7 +6045,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6034 "SearchBoolean.c" +#line 6039 "SearchBoolean.c" goto __catch79_database_error; } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6049,7 +6054,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { g_clear_error (&_inner_error_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6043 "SearchBoolean.c" +#line 6048 "SearchBoolean.c" } { GeeList* _row_list = NULL; @@ -6077,7 +6082,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { _row_index = -1; #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 6071 "SearchBoolean.c" +#line 6076 "SearchBoolean.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -6100,7 +6105,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { if (!(_tmp10_ < _tmp11_)) { #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 6094 "SearchBoolean.c" +#line 6099 "SearchBoolean.c" } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp12_ = _row_list; @@ -6122,15 +6127,15 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { _g_object_unref0 (_tmp17_); #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (row); -#line 6116 "SearchBoolean.c" +#line 6121 "SearchBoolean.c" } #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_row_list); -#line 6120 "SearchBoolean.c" +#line 6125 "SearchBoolean.c" } #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (_tmp0_); -#line 6124 "SearchBoolean.c" +#line 6129 "SearchBoolean.c" } goto __finally79; __catch79_database_error: @@ -6147,7 +6152,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { app_window_database_error (_tmp18_); #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6141 "SearchBoolean.c" +#line 6146 "SearchBoolean.c" } __finally79: #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6158,25 +6163,25 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) { g_clear_error (&_inner_error_); #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6152 "SearchBoolean.c" +#line 6157 "SearchBoolean.c" } #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self; -#line 6156 "SearchBoolean.c" +#line 6161 "SearchBoolean.c" } static SavedSearchTable* saved_search_table_new (void) { #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return saved_search_table_construct (TYPE_SAVED_SEARCH_TABLE); -#line 6163 "SearchBoolean.c" +#line 6168 "SearchBoolean.c" } static gpointer _saved_search_table_ref0 (gpointer self) { #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return self ? saved_search_table_ref (self) : NULL; -#line 6170 "SearchBoolean.c" +#line 6175 "SearchBoolean.c" } @@ -6189,7 +6194,7 @@ SavedSearchTable* saved_search_table_get_instance (void) { _tmp0_ = saved_search_table_instance; #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_tmp0_ == NULL) { -#line 6183 "SearchBoolean.c" +#line 6188 "SearchBoolean.c" SavedSearchTable* _tmp1_ = NULL; #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = saved_search_table_new (); @@ -6197,7 +6202,7 @@ SavedSearchTable* saved_search_table_get_instance (void) { _saved_search_table_unref0 (saved_search_table_instance); #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_instance = _tmp1_; -#line 6191 "SearchBoolean.c" +#line 6196 "SearchBoolean.c" } #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = saved_search_table_instance; @@ -6207,7 +6212,7 @@ SavedSearchTable* saved_search_table_get_instance (void) { result = _tmp3_; #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6201 "SearchBoolean.c" +#line 6206 "SearchBoolean.c" } @@ -6221,14 +6226,14 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self) { #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = self->priv->search_map; #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = _tmp1_; #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6222 "SearchBoolean.c" +#line 6227 "SearchBoolean.c" } @@ -6248,7 +6253,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_return_val_if_fail (GEE_IS_ARRAY_LIST (conditions), NULL); #line 923 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" search = NULL; -#line 6242 "SearchBoolean.c" +#line 6247 "SearchBoolean.c" { SavedSearchRow* _tmp0_ = NULL; SavedSearchDBTable* _tmp1_ = NULL; @@ -6281,7 +6286,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam if (G_UNLIKELY (_inner_error_ != NULL)) { #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6275 "SearchBoolean.c" +#line 6280 "SearchBoolean.c" goto __catch80_database_error; } #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6292,7 +6297,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_clear_error (&_inner_error_); #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6286 "SearchBoolean.c" +#line 6291 "SearchBoolean.c" } #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp8_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); @@ -6302,7 +6307,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam search = _tmp8_; #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _saved_search_row_unref0 (_tmp0_); -#line 6296 "SearchBoolean.c" +#line 6301 "SearchBoolean.c" } goto __finally80; __catch80_database_error: @@ -6319,7 +6324,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam app_window_database_error (_tmp9_); #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6313 "SearchBoolean.c" +#line 6318 "SearchBoolean.c" } __finally80: #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6332,7 +6337,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam g_clear_error (&_inner_error_); #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6326 "SearchBoolean.c" +#line 6331 "SearchBoolean.c" } #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp10_ = search; @@ -6352,7 +6357,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam result = search; #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6346 "SearchBoolean.c" +#line 6351 "SearchBoolean.c" } @@ -6363,7 +6368,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_return_if_fail (IS_SAVED_SEARCH_TABLE (self)); #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 6357 "SearchBoolean.c" +#line 6362 "SearchBoolean.c" { SavedSearchDBTable* _tmp0_ = NULL; SavedSearchDBTable* _tmp1_ = NULL; @@ -6385,7 +6390,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6379 "SearchBoolean.c" +#line 6384 "SearchBoolean.c" goto __catch81_database_error; } #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6394,7 +6399,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_clear_error (&_inner_error_); #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 6388 "SearchBoolean.c" +#line 6393 "SearchBoolean.c" } } goto __finally81; @@ -6412,7 +6417,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { app_window_database_error (_tmp4_); #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_error_free0 (err); -#line 6406 "SearchBoolean.c" +#line 6411 "SearchBoolean.c" } __finally81: #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" @@ -6423,13 +6428,13 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) { g_clear_error (&_inner_error_); #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return; -#line 6417 "SearchBoolean.c" +#line 6422 "SearchBoolean.c" } #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp5_ = search; #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_remove_from_map (self, _tmp5_); -#line 6423 "SearchBoolean.c" +#line 6428 "SearchBoolean.c" } @@ -6462,7 +6467,7 @@ void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) _tmp5_ = search; #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_signal_emit_by_name (self, "search-added", _tmp5_); -#line 6456 "SearchBoolean.c" +#line 6461 "SearchBoolean.c" } @@ -6492,7 +6497,7 @@ void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* se _tmp4_ = search; #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_signal_emit_by_name (self, "search-removed", _tmp4_); -#line 6486 "SearchBoolean.c" +#line 6491 "SearchBoolean.c" } @@ -6506,14 +6511,14 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) { #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = self->priv->search_map; #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = _tmp1_; #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable); #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6507 "SearchBoolean.c" +#line 6512 "SearchBoolean.c" } @@ -6527,14 +6532,14 @@ gint saved_search_table_get_count (SavedSearchTable* self) { #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = self->priv->search_map; #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap)); + _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp2_ = _tmp1_; #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" result = _tmp2_; #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6528 "SearchBoolean.c" +#line 6533 "SearchBoolean.c" } @@ -6557,7 +6562,7 @@ gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_ result = _tmp2_; #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6551 "SearchBoolean.c" +#line 6556 "SearchBoolean.c" } @@ -6566,19 +6571,19 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { gchar* _tmp7_ = NULL; #line 971 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL); -#line 6560 "SearchBoolean.c" +#line 6565 "SearchBoolean.c" { gint ctr = 0; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ctr = 1; -#line 6565 "SearchBoolean.c" +#line 6570 "SearchBoolean.c" { gboolean _tmp0_ = FALSE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = TRUE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" while (TRUE) { -#line 6572 "SearchBoolean.c" +#line 6577 "SearchBoolean.c" gint _tmp2_ = 0; gchar* name = NULL; gint _tmp3_ = 0; @@ -6587,13 +6592,13 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { gboolean _tmp6_ = FALSE; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!_tmp0_) { -#line 6581 "SearchBoolean.c" +#line 6586 "SearchBoolean.c" gint _tmp1_ = 0; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp1_ = ctr; #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" ctr = _tmp1_ + 1; -#line 6587 "SearchBoolean.c" +#line 6592 "SearchBoolean.c" } #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp0_ = FALSE; @@ -6603,7 +6608,7 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { if (!(_tmp2_ < G_MAXINT)) { #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" break; -#line 6597 "SearchBoolean.c" +#line 6602 "SearchBoolean.c" } #line 973 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _tmp3_ = ctr; @@ -6621,11 +6626,11 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { result = name; #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6615 "SearchBoolean.c" +#line 6620 "SearchBoolean.c" } #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_free0 (name); -#line 6619 "SearchBoolean.c" +#line 6624 "SearchBoolean.c" } } } @@ -6635,14 +6640,14 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) { result = _tmp7_; #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return result; -#line 6629 "SearchBoolean.c" +#line 6634 "SearchBoolean.c" } static void value_saved_search_table_init (GValue* value) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6636 "SearchBoolean.c" +#line 6641 "SearchBoolean.c" } @@ -6651,7 +6656,7 @@ static void value_saved_search_table_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (value->data[0].v_pointer); -#line 6645 "SearchBoolean.c" +#line 6650 "SearchBoolean.c" } } @@ -6661,11 +6666,11 @@ static void value_saved_search_table_copy_value (const GValue* src_value, GValue if (src_value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = saved_search_table_ref (src_value->data[0].v_pointer); -#line 6655 "SearchBoolean.c" +#line 6660 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" dest_value->data[0].v_pointer = NULL; -#line 6659 "SearchBoolean.c" +#line 6664 "SearchBoolean.c" } } @@ -6673,37 +6678,37 @@ static void value_saved_search_table_copy_value (const GValue* src_value, GValue static gpointer value_saved_search_table_peek_pointer (const GValue* value) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 6667 "SearchBoolean.c" +#line 6672 "SearchBoolean.c" } static gchar* value_saved_search_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (collect_values[0].v_pointer) { -#line 6674 "SearchBoolean.c" +#line 6679 "SearchBoolean.c" SavedSearchTable* object; object = collect_values[0].v_pointer; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (object->parent_instance.g_class == NULL) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6681 "SearchBoolean.c" +#line 6686 "SearchBoolean.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.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 6685 "SearchBoolean.c" +#line 6690 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = saved_search_table_ref (object); -#line 6689 "SearchBoolean.c" +#line 6694 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6693 "SearchBoolean.c" +#line 6698 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6697 "SearchBoolean.c" +#line 6702 "SearchBoolean.c" } @@ -6714,25 +6719,25 @@ static gchar* value_saved_search_table_lcopy_value (const GValue* value, guint n if (!object_p) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6708 "SearchBoolean.c" +#line 6713 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (!value->data[0].v_pointer) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = NULL; -#line 6714 "SearchBoolean.c" +#line 6719 "SearchBoolean.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = value->data[0].v_pointer; -#line 6718 "SearchBoolean.c" +#line 6723 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" *object_p = saved_search_table_ref (value->data[0].v_pointer); -#line 6722 "SearchBoolean.c" +#line 6727 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return NULL; -#line 6726 "SearchBoolean.c" +#line 6731 "SearchBoolean.c" } @@ -6746,7 +6751,7 @@ GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return G_PARAM_SPEC (spec); -#line 6740 "SearchBoolean.c" +#line 6745 "SearchBoolean.c" } @@ -6755,7 +6760,7 @@ gpointer value_get_saved_search_table (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE), NULL); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return value->data[0].v_pointer; -#line 6749 "SearchBoolean.c" +#line 6754 "SearchBoolean.c" } @@ -6775,17 +6780,17 @@ void value_set_saved_search_table (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_ref (value->data[0].v_pointer); -#line 6769 "SearchBoolean.c" +#line 6774 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6773 "SearchBoolean.c" +#line 6778 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (old); -#line 6779 "SearchBoolean.c" +#line 6784 "SearchBoolean.c" } } @@ -6804,17 +6809,17 @@ void value_take_saved_search_table (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = v_object; -#line 6798 "SearchBoolean.c" +#line 6803 "SearchBoolean.c" } else { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" value->data[0].v_pointer = NULL; -#line 6802 "SearchBoolean.c" +#line 6807 "SearchBoolean.c" } #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" if (old) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" saved_search_table_unref (old); -#line 6808 "SearchBoolean.c" +#line 6813 "SearchBoolean.c" } } @@ -6830,7 +6835,7 @@ static void saved_search_table_class_init (SavedSearchTableClass * klass) { g_signal_new ("search_added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_signal_new ("search_removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH); -#line 6824 "SearchBoolean.c" +#line 6829 "SearchBoolean.c" } @@ -6839,12 +6844,12 @@ static void saved_search_table_instance_init (SavedSearchTable * self) { #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv = SAVED_SEARCH_TABLE_GET_PRIVATE (self); #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->priv->search_map = _tmp0_; #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" self->ref_count = 1; -#line 6838 "SearchBoolean.c" +#line 6843 "SearchBoolean.c" } @@ -6856,7 +6861,7 @@ static void saved_search_table_finalize (SavedSearchTable* obj) { g_signal_handlers_destroy (self); #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" _g_object_unref0 (self->priv->search_map); -#line 6850 "SearchBoolean.c" +#line 6855 "SearchBoolean.c" } @@ -6881,7 +6886,7 @@ gpointer saved_search_table_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" return instance; -#line 6875 "SearchBoolean.c" +#line 6880 "SearchBoolean.c" } @@ -6894,7 +6899,7 @@ void saved_search_table_unref (gpointer instance) { SAVED_SEARCH_TABLE_GET_CLASS (self)->finalize (self); #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6888 "SearchBoolean.c" +#line 6893 "SearchBoolean.c" } } |