isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed-layout: Use a better quark name

Browse Source 
The "fixed-container" name is far too generic, and it may very likely
lead to collisions with application code.
This commit is contained in:
Emmanuele Bassi 2011-12-08 10:01:06 +00:00
parent 20b9ec8c6b
commit 79c04bd133
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter-fixed-layout.c
View File

@ -157,10 +157,13 @@ clutter_fixed_layout_set_container (ClutterLayoutManager *manager,
ClutterContainer *container) ClutterContainer *container)
{ {
ClutterLayoutManagerClass *parent_class; ClutterLayoutManagerClass *parent_class;
GObject *obj = G_OBJECT (manager);
if (container != NULL) 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 /* signal Clutter that we don't impose any layout on
* our children, so we can shave off some relayout * our children, so we can shave off some relayout
@ -172,11 +175,13 @@ clutter_fixed_layout_set_container (ClutterLayoutManager *manager,
{ {
gpointer old_container; 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) if (old_container != NULL)
CLUTTER_ACTOR_UNSET_FLAGS (old_container, CLUTTER_ACTOR_NO_LAYOUT); 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); parent_class = CLUTTER_LAYOUT_MANAGER_CLASS (clutter_fixed_layout_parent_class);