[clutter] fixed-layout: Use a better quark name
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] fixed-layout: Use a better quark name
- Date: Fri, 9 Dec 2011 16:27:38 +0000 (UTC)
commit 79c04bd1335db04b5152130a027d2d22c9486f56
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Thu Dec 8 10:01:06 2011 +0000
fixed-layout: Use a better quark name
The "fixed-container" name is far too generic, and it may very likely
lead to collisions with application code.
clutter/clutter-fixed-layout.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/clutter/clutter-fixed-layout.c b/clutter/clutter-fixed-layout.c
index 919a856..35d5a6a 100644
--- a/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter-fixed-layout.c
@@ -157,10 +157,13 @@ clutter_fixed_layout_set_container (ClutterLayoutManager *manager,
ClutterContainer *container)
{
ClutterLayoutManagerClass *parent_class;
+ GObject *obj = G_OBJECT (manager);
if (container != NULL)
{
- g_object_set_data (G_OBJECT (manager), "fixed-container", container);
+ g_object_set_data (obj,
+ "-clutter-fixed-layout-container",
+ container);
/* signal Clutter that we don't impose any layout on
* our children, so we can shave off some relayout
@@ -172,11 +175,13 @@ clutter_fixed_layout_set_container (ClutterLayoutManager *manager,
{
gpointer old_container;
- old_container = g_object_get_data (G_OBJECT (manager), "fixed-container");
+ old_container =
+ g_object_get_data (obj, "-clutter-fixed-layout-container");
+
if (old_container != NULL)
CLUTTER_ACTOR_UNSET_FLAGS (old_container, CLUTTER_ACTOR_NO_LAYOUT);
- g_object_set_data (G_OBJECT (manager), "fixed-container", NULL);
+ g_object_set_data (obj, "-clutter-fixed-layout-container", NULL);
}
parent_class = CLUTTER_LAYOUT_MANAGER_CLASS (clutter_fixed_layout_parent_class);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]