summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-01-02 02:22:52 +0100
committerBenjamin Otte <otte@redhat.com>2012-01-09 18:37:54 +0100
commit14994e3fc9fd86343978dd21fe2b32008c7863e9 (patch)
treec6c1803a6112be86c36a59c4b56e263897e9fe5f
parent01548bfcbe71cb2b211fd5878c2dc0c3579c277e (diff)
downloadgtk+-14994e3fc9fd86343978dd21fe2b32008c7863e9.tar.gz
styleproperty: Remove _gtk_style_property_unpack()
The function is no longer needed in public API
-rw-r--r--gtk/gtkcssshorthandproperty.c4
-rw-r--r--gtk/gtkstyleproperty.c13
-rw-r--r--gtk/gtkstylepropertyprivate.h4
3 files changed, 2 insertions, 19 deletions
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index bc0e802eed..79fb1d24f0 100644
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -71,7 +71,7 @@ _gtk_css_shorthand_property_assign (GtkStyleProperty *property,
GParameter *parameters;
guint i, n_parameters;
- parameters = _gtk_style_property_unpack (property, value, &n_parameters);
+ parameters = property->unpack_func (value, &n_parameters);
for (i = 0; i < n_parameters; i++)
{
@@ -196,7 +196,7 @@ gtk_css_shorthand_property_parse (GtkCssShorthandProperty *shorthand,
return FALSE;
}
- parameters = _gtk_style_property_unpack (property, &val, &n_parameters);
+ parameters = property->unpack_func (&val, &n_parameters);
g_value_unset (&val);
for (i = 0; i < shorthand->subproperties->len; i++)
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 080e3abff4..78037f3796 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -455,19 +455,6 @@ gtk_style_property_real_parse_value (GtkStyleProperty *property,
return _gtk_css_style_parse_value (value, parser, base);
}
-GParameter *
-_gtk_style_property_unpack (GtkStyleProperty *property,
- const GValue *value,
- guint *n_params)
-{
- g_return_val_if_fail (property != NULL, NULL);
- g_return_val_if_fail (property->unpack_func != NULL, NULL);
- g_return_val_if_fail (value != NULL, NULL);
- g_return_val_if_fail (n_params != NULL, NULL);
-
- return property->unpack_func (value, n_params);
-}
-
/**
* _gtk_style_property_assign:
* @property: the property
diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 2326a0933d..e50e453684 100644
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -99,10 +99,6 @@ void _gtk_style_property_register (GParamSpec
GtkStylePrintFunc print_func,
const GValue *initial_value);
-GParameter * _gtk_style_property_unpack (GtkStyleProperty * property,
- const GValue *value,
- guint *n_params);
-
gboolean _gtk_style_property_parse_value (GtkStyleProperty * property,
GValue *value,
GtkCssParser *parser,