diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-12-09 19:31:17 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2014-12-10 03:49:40 +0100 |
| commit | b49c7c34214da2d8d5e6dae2e8d0b0fe1b23f68e (patch) | |
| tree | 63fc00413ce9740a26b375947cdc7bf874feaa22 /gtk/gtkcssprovider.c | |
| parent | 14f5ce710856708dc80fcc98cb5eb2ba257f34ad (diff) | |
| download | gtk+-b49c7c34214da2d8d5e6dae2e8d0b0fe1b23f68e.tar.gz | |
styleprovider: Fold get_change() vfunc into lookup()
Diffstat (limited to 'gtk/gtkcssprovider.c')
| -rw-r--r-- | gtk/gtkcssprovider.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 6b02befcd4..06755037ee 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1774,7 +1774,8 @@ gtk_css_style_provider_get_keyframes (GtkStyleProviderPrivate *provider, static void gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider, const GtkCssMatcher *matcher, - GtkCssLookup *lookup) + GtkCssLookup *lookup, + GtkCssChange *change) { GtkCssProvider *css_provider; GtkCssProviderPrivate *priv; @@ -1819,24 +1820,16 @@ gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider, } g_ptr_array_free (tree_rules, TRUE); -} - -static GtkCssChange -gtk_css_style_provider_get_change (GtkStyleProviderPrivate *provider, - const GtkCssMatcher *matcher) -{ - GtkCssProvider *css_provider; - GtkCssProviderPrivate *priv; - GtkCssChange change; - css_provider = GTK_CSS_PROVIDER (provider); - priv = css_provider->priv; - - change = _gtk_css_selector_tree_get_change_all (priv->tree, matcher); + if (change) + { + GtkCssMatcher change_matcher; - verify_tree_get_change_results (css_provider, matcher, change); + _gtk_css_matcher_superset_init (&change_matcher, matcher, GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_CLASS); - return change; + *change = _gtk_css_selector_tree_get_change_all (priv->tree, &change_matcher); + verify_tree_get_change_results (css_provider, &change_matcher, *change); + } } static void @@ -1845,7 +1838,6 @@ gtk_css_style_provider_private_iface_init (GtkStyleProviderPrivateInterface *ifa iface->get_color = gtk_css_style_provider_get_color; iface->get_keyframes = gtk_css_style_provider_get_keyframes; iface->lookup = gtk_css_style_provider_lookup; - iface->get_change = gtk_css_style_provider_get_change; } static void |