From efd7ad7e55357e3f656a9158c911521646898a2e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 8 Jan 2009 17:06:04 +0000 Subject: [PATCH] [text] Fix GObject properties in ClutterText Some of the read-write properties of ClutterText were missing an implementation in clutter_text_get_property(), as well as the :position and :selection-bound properties being wrongly converted from fixed point to integer, passing through floating point values. --- clutter/clutter-text.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c index 4b7ae3f13..76721a6d2 100644 --- a/clutter/clutter-text.c +++ b/clutter/clutter-text.c @@ -688,11 +688,11 @@ clutter_text_get_property (GObject *gobject, break; case PROP_POSITION: - g_value_set_int (value, CLUTTER_FIXED_TO_FLOAT (priv->position)); + g_value_set_int (value, priv->position); break; case PROP_SELECTION_BOUND: - g_value_set_int (value, CLUTTER_FIXED_TO_FLOAT (priv->selection_bound)); + g_value_set_int (value, priv->selection_bound); break; case PROP_EDITABLE: @@ -719,6 +719,30 @@ clutter_text_get_property (GObject *gobject, g_value_set_boolean (value, priv->single_line_mode); break; + case PROP_ELLIPSIZE: + g_value_set_enum (value, priv->ellipsize); + break; + + case PROP_LINE_WRAP: + g_value_set_boolean (value, priv->wrap); + break; + + case PROP_LINE_WRAP_MODE: + g_value_set_enum (value, priv->wrap_mode); + break; + + case PROP_ALIGNMENT: + g_value_set_enum (value, priv->alignment); + break; + + case PROP_JUSTIFY: + g_value_set_boolean (value, priv->justify); + break; + + case PROP_ATTRIBUTES: + g_value_set_boxed (value, priv->attrs); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); }