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/gtkstyleproviderprivate.c | |
| parent | 14f5ce710856708dc80fcc98cb5eb2ba257f34ad (diff) | |
| download | gtk+-b49c7c34214da2d8d5e6dae2e8d0b0fe1b23f68e.tar.gz | |
styleprovider: Fold get_change() vfunc into lookup()
Diffstat (limited to 'gtk/gtkstyleproviderprivate.c')
| -rw-r--r-- | gtk/gtkstyleproviderprivate.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/gtk/gtkstyleproviderprivate.c b/gtk/gtkstyleproviderprivate.c index 1f62b88807..35a6f6e0f6 100644 --- a/gtk/gtkstyleproviderprivate.c +++ b/gtk/gtkstyleproviderprivate.c @@ -84,7 +84,8 @@ _gtk_style_provider_private_get_keyframes (GtkStyleProviderPrivate *provider, void _gtk_style_provider_private_lookup (GtkStyleProviderPrivate *provider, const GtkCssMatcher *matcher, - GtkCssLookup *lookup) + GtkCssLookup *lookup, + GtkCssChange *out_change) { GtkStyleProviderPrivateInterface *iface; @@ -92,29 +93,15 @@ _gtk_style_provider_private_lookup (GtkStyleProviderPrivate *provider, g_return_if_fail (matcher != NULL); g_return_if_fail (lookup != NULL); + if (out_change) + *out_change = 0; + iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); if (!iface->lookup) return; - iface->lookup (provider, matcher, lookup); -} - -GtkCssChange -_gtk_style_provider_private_get_change (GtkStyleProviderPrivate *provider, - const GtkCssMatcher *matcher) -{ - GtkStyleProviderPrivateInterface *iface; - - g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), GTK_CSS_CHANGE_ANY); - g_return_val_if_fail (matcher != NULL, GTK_CSS_CHANGE_ANY); - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (!iface->get_change) - return GTK_CSS_CHANGE_ANY; - - return iface->get_change (provider, matcher); + iface->lookup (provider, matcher, lookup, out_change); } void |