[gtk+/wip/css: 92/125] styleproperty: Move pspec to GtkCssCustomProperty
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/css: 92/125] styleproperty: Move pspec to GtkCssCustomProperty
- Date: Tue, 3 Jan 2012 04:18:27 +0000 (UTC)
commit 30e0657ea796b14d62ad09f0e506fbcf02f13eb3
Author: Benjamin Otte <otte redhat com>
Date: Mon Jan 2 12:12:29 2012 +0100
styleproperty: Move pspec to GtkCssCustomProperty
It's only used there.
gtk/gtkcsscustomproperty.c | 6 +++---
gtk/gtkcsscustompropertyprivate.h | 1 +
gtk/gtkcssstylepropertyprivate.h | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 9d4c61f..de7238c 100644
--- 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 e4eb364..216ce7c 100644
--- 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 3fe477e..79516f4 100644
--- a/gtk/gtkcssstylepropertyprivate.h
+++ b/gtk/gtkcssstylepropertyprivate.h
@@ -41,7 +41,6 @@ struct _GtkCssStyleProperty
GValue initial_value;
guint id;
- GParamSpec *pspec;
guint inherit :1;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]