styleproperty: Move pspec to GtkCssCustomProperty

It's only used there.

diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 9d4c61f47cc8d8d52ff0b45da0c3d14b67c5f458..de7238c36ad4164c6dcb2dae0f26788f5fc99a10 100644 (file)
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -164,7 +164,7 @@ gtk_theming_engine_register_property (const gchar            *name_space,
                        "name", name,
                        "value-type", pspec->value_type,
                        NULL);
-  GTK_CSS_STYLE_PROPERTY (node)->pspec = pspec;
+  node->pspec = pspec;
   node->property_parse_func = parse_func;
 
   g_value_unset (&initial);
@@ -199,7 +199,7 @@ gtk_style_properties_register_property (GtkStylePropertyParser  parse_func,
                        "name", pspec->name,
                        "value-type", pspec->value_type,
                        NULL);
-  GTK_CSS_STYLE_PROPERTY (node)->pspec = pspec;
+  node->pspec = pspec;
   node->property_parse_func = parse_func;
 
   g_value_unset (&initial);
@@ -236,7 +236,7 @@ gtk_style_properties_lookup_property (const gchar             *property_name,
       GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (node);
 
       if (pspec)
-        *pspec = GTK_CSS_STYLE_PROPERTY (node)->pspec;
+        *pspec = custom->pspec;
 
       if (parse_func)
         *parse_func = custom->property_parse_func;

diff --git a/gtk/gtkcsscustompropertyprivate.h b/gtk/gtkcsscustompropertyprivate.h
index e4eb364de1fd163aae2cf5c0c419eeeada9bc63e..216ce7cbf751708d5fd707a827d4fa581a73f1e6 100644 (file)
--- a/gtk/gtkcsscustompropertyprivate.h
+++ b/gtk/gtkcsscustompropertyprivate.h
@@ -39,6 +39,7 @@ struct _GtkCssCustomProperty
 {
   GtkCssStyleProperty parent;
 
+  GParamSpec *pspec;
   GtkStylePropertyParser property_parse_func;
 };
 

diff --git a/gtk/gtkcssstylepropertyprivate.h b/gtk/gtkcssstylepropertyprivate.h
index 3fe477e9a133694fcd6f4bb6d54f09324bb6a42c..79516f4b40f9a7e7d7dd82e470cfeee35082d884 100644 (file)
--- a/gtk/gtkcssstylepropertyprivate.h
+++ b/gtk/gtkcssstylepropertyprivate.h
@@ -41,7 +41,6 @@ struct _GtkCssStyleProperty
 
   GValue initial_value;
   guint id;
-  GParamSpec *pspec;
   guint inherit :1;
 };