diff options
author | Benjamin Otte <otte@redhat.com> | 2015-12-04 16:53:50 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2015-12-04 17:44:51 +0100 |
commit | 1b835fc7ce679947669b53b55d2b84f9582f661a (patch) | |
tree | 04d1de2c8d0b03cf6e08ec6a20cb58559612f817 | |
parent | a37220109fa0952e4f3c7e188ccd574cdac6a660 (diff) | |
download | gtk+-1b835fc7ce679947669b53b55d2b84f9582f661a.tar.gz |
css: Leftover renaming gtk-image-effect => icon-effect
The previous renaming commit was incomplete, so here we go again.
-rw-r--r-- | gtk/deprecated/gtkiconfactory.c | 2 | ||||
-rw-r--r-- | gtk/gtkcssenumvalue.c | 10 | ||||
-rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 2 | ||||
-rw-r--r-- | gtk/gtkcsstypesprivate.h | 2 | ||||
-rw-r--r-- | gtk/gtkrender.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c index 690b208724..1508da583a 100644 --- a/gtk/deprecated/gtkiconfactory.c +++ b/gtk/deprecated/gtkiconfactory.c @@ -1443,7 +1443,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS; effect = _gtk_css_icon_effect_value_get - (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT)); + (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT)); switch (effect) { diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c index 1f356a30ad..c606f0bffd 100644 --- a/gtk/gtkcssenumvalue.c +++ b/gtk/gtkcssenumvalue.c @@ -871,7 +871,7 @@ _gtk_css_fill_mode_value_get (const GtkCssValue *value) /* GtkCssIconEffect */ -static const GtkCssValueClass GTK_CSS_VALUE_IMAGE_EFFECT = { +static const GtkCssValueClass GTK_CSS_VALUE_ICON_EFFECT = { gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -880,9 +880,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_IMAGE_EFFECT = { }; static GtkCssValue image_effect_values[] = { - { >K_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_NONE, "none" }, - { >K_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_HIGHLIGHT, "highlight" }, - { >K_CSS_VALUE_IMAGE_EFFECT, 1, GTK_CSS_ICON_EFFECT_DIM, "dim" } + { >K_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_NONE, "none" }, + { >K_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_HIGHLIGHT, "highlight" }, + { >K_CSS_VALUE_ICON_EFFECT, 1, GTK_CSS_ICON_EFFECT_DIM, "dim" } }; GtkCssValue * @@ -918,7 +918,7 @@ _gtk_css_icon_effect_value_try_parse (GtkCssParser *parser) GtkCssIconEffect _gtk_css_icon_effect_value_get (const GtkCssValue *value) { - g_return_val_if_fail (value->class == >K_CSS_VALUE_IMAGE_EFFECT, GTK_CSS_ICON_EFFECT_NONE); + g_return_val_if_fail (value->class == >K_CSS_VALUE_ICON_EFFECT, GTK_CSS_ICON_EFFECT_NONE); return value->value; } diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 60030817eb..2b9c51da66 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -1727,7 +1727,7 @@ _gtk_css_style_property_init_properties (void) NULL, _gtk_css_number_value_new (1, GTK_CSS_NUMBER)); gtk_css_style_property_register ("-gtk-icon-effect", - GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT, + GTK_CSS_PROPERTY_ICON_EFFECT, G_TYPE_NONE, GTK_STYLE_PROPERTY_INHERIT, GTK_CSS_AFFECTS_ICON, diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h index 692bea9110..0bd818fa3c 100644 --- a/gtk/gtkcsstypesprivate.h +++ b/gtk/gtkcsstypesprivate.h @@ -216,7 +216,7 @@ enum { /*< skip >*/ GTK_CSS_PROPERTY_ANIMATION_DELAY, GTK_CSS_PROPERTY_ANIMATION_FILL_MODE, GTK_CSS_PROPERTY_OPACITY, - GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT, + GTK_CSS_PROPERTY_ICON_EFFECT, GTK_CSS_PROPERTY_ICON_PALETTE, GTK_CSS_PROPERTY_ENGINE, GTK_CSS_PROPERTY_GTK_KEY_BINDINGS, diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c index 27b253d7b3..1f44b2e401 100644 --- a/gtk/gtkrender.c +++ b/gtk/gtkrender.c @@ -1091,7 +1091,7 @@ gtk_render_icon_pixbuf_for_style (GtkCssStyle *style, if (!wildcarded) return scaled; - icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT)); + icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT)); if (icon_effect != GTK_CSS_ICON_EFFECT_NONE) { |