summaryrefslogtreecommitdiff
path: root/gtk/gtkstylecascade.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-11-25 02:28:59 +0100
committerBenjamin Otte <otte@redhat.com>2012-11-25 02:45:10 +0100
commit42dc0ea0fd423f3794d1f77bb9bb84d5bc9d3c0e (patch)
tree90c183370b1dca8f1b54222593bf005dd88a7dff /gtk/gtkstylecascade.c
parent08ac1504d2c99d8bfd8ba3fb384f09263dcc66e5 (diff)
downloadgtk+-42dc0ea0fd423f3794d1f77bb9bb84d5bc9d3c0e.tar.gz
styleprovider: Change function prototype
Make _gtk_style_provider_private_get_color() return a GtkCssValue (a GtkCssColorValue to be exact) instead of GtkSymbolicColor. With this, the symbolic color usage inside GTK is minimized.
Diffstat (limited to 'gtk/gtkstylecascade.c')
-rw-r--r--gtk/gtkstylecascade.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkstylecascade.c b/gtk/gtkstylecascade.c
index 5061a060b8..a71a55e2a8 100644
--- a/gtk/gtkstylecascade.c
+++ b/gtk/gtkstylecascade.c
@@ -123,13 +123,13 @@ gtk_style_cascade_provider_iface_init (GtkStyleProviderIface *iface)
iface->get_style_property = gtk_style_cascade_get_style_property;
}
-static GtkSymbolicColor *
+static GtkCssValue *
gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider,
const char *name)
{
GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider);
GtkStyleCascadeIter iter;
- GtkSymbolicColor *symbolic;
+ GtkCssValue *color;
GtkStyleProvider *item;
for (item = gtk_style_cascade_iter_init (cascade, &iter);
@@ -138,9 +138,9 @@ gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider,
{
if (GTK_IS_STYLE_PROVIDER_PRIVATE (item))
{
- symbolic = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (item), name);
- if (symbolic)
- return symbolic;
+ color = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (item), name);
+ if (color)
+ return color;
}
else
{