diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-01-09 16:13:03 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2012-03-01 11:41:51 +0000 |
| commit | 8ac2200aac44d481f2b069554e85976ad1f47372 (patch) | |
| tree | 483fd892f4c6c66c46f49c2757b9f4e3b4d4d740 | |
| parent | 1b77565e63d6bfc2dd4edd6961e39044d536b08b (diff) | |
| download | clutter-8ac2200aac44d481f2b069554e85976ad1f47372.tar.gz | |
clutter-wayland-surface: Rename the width/height properties
This patch renames the width/height properties to
surface-width/surface-height so that they won't override the
width/height properties of ClutterActor which have different
semantics.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
| -rw-r--r-- | clutter/wayland/clutter-wayland-surface.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/clutter/wayland/clutter-wayland-surface.c b/clutter/wayland/clutter-wayland-surface.c index c368c1edf..3f1c28ee8 100644 --- a/clutter/wayland/clutter-wayland-surface.c +++ b/clutter/wayland/clutter-wayland-surface.c @@ -54,8 +54,8 @@ enum { PROP_SURFACE = 1, - PROP_WIDTH, - PROP_HEIGHT + PROP_SURFACE_WIDTH, + PROP_SURFACE_HEIGHT }; #if 0 @@ -204,12 +204,12 @@ set_size (ClutterWaylandSurface *self, if (priv->width != width) { priv->width = width; - g_object_notify (G_OBJECT (self), "width"); + g_object_notify (G_OBJECT (self), "surface-width"); } if (priv->height != height) { priv->height = height; - g_object_notify (G_OBJECT (self), "height"); + g_object_notify (G_OBJECT (self), "surface-height"); } clutter_actor_set_size (CLUTTER_ACTOR (self), priv->width, priv->height); @@ -289,10 +289,10 @@ clutter_wayland_surface_get_property (GObject *object, case PROP_SURFACE: g_value_set_pointer (value, priv->surface); break; - case PROP_WIDTH: + case PROP_SURFACE_WIDTH: g_value_set_uint (value, priv->width); break; - case PROP_HEIGHT: + case PROP_SURFACE_HEIGHT: g_value_set_uint (value, priv->height); break; default: @@ -420,23 +420,23 @@ clutter_wayland_surface_class_init (ClutterWaylandSurfaceClass *klass) g_object_class_install_property (object_class, PROP_SURFACE, pspec); - pspec = g_param_spec_uint ("width", + pspec = g_param_spec_uint ("surface-width", P_("Surface width"), P_("The width of the underlying wayland surface"), 0, G_MAXUINT, 0, G_PARAM_READABLE); - g_object_class_install_property (object_class, PROP_WIDTH, pspec); + g_object_class_install_property (object_class, PROP_SURFACE_WIDTH, pspec); - pspec = g_param_spec_uint ("height", + pspec = g_param_spec_uint ("surface-height", P_("Surface height"), P_("The height of the underlying wayland surface"), 0, G_MAXUINT, 0, G_PARAM_READABLE); - g_object_class_install_property (object_class, PROP_HEIGHT, pspec); + g_object_class_install_property (object_class, PROP_SURFACE_HEIGHT, pspec); } /** |