isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-19 22:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage: Unconditionally create the devices hash table

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-02-03 11:26:09 +00:00
parent f133d84c02
commit 63e88d9840
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-stage.c
View File

@ -1211,8 +1211,7 @@ clutter_stage_finalize (GObject *object)
g_array_free (priv->paint_volume_stack, TRUE); g_array_free (priv->paint_volume_stack, TRUE);
if (priv->devices != NULL) g_hash_table_destroy (priv->devices);
g_hash_table_destroy (priv->devices);
G_OBJECT_CLASS (clutter_stage_parent_class)->finalize (object); G_OBJECT_CLASS (clutter_stage_parent_class)->finalize (object);
} }
@ -1632,6 +1631,8 @@ clutter_stage_init (ClutterStage *self)
priv->paint_volume_stack = priv->paint_volume_stack =
g_array_new (FALSE, FALSE, sizeof (ClutterPaintVolume)); g_array_new (FALSE, FALSE, sizeof (ClutterPaintVolume));
priv->devices = g_hash_table_new (NULL, NULL);
} }
/** /**
@ -3390,9 +3391,6 @@ _clutter_stage_add_device (ClutterStage *stage,
{ {
ClutterStagePrivate *priv = stage->priv; ClutterStagePrivate *priv = stage->priv;
if (G_UNLIKELY (priv->devices == NULL))
priv->devices = g_hash_table_new (NULL, NULL);
if (g_hash_table_lookup (priv->devices, device) != NULL) if (g_hash_table_lookup (priv->devices, device) != NULL)
return; return;
@ -3406,9 +3404,6 @@ _clutter_stage_remove_device (ClutterStage *stage,
{ {
ClutterStagePrivate *priv = stage->priv; ClutterStagePrivate *priv = stage->priv;
if (G_UNLIKELY (priv->devices == NULL))
return;
_clutter_input_device_set_stage (device, NULL); _clutter_input_device_set_stage (device, NULL);
g_hash_table_remove (priv->devices, device); g_hash_table_remove (priv->devices, device);
} }
@ -3419,8 +3414,5 @@ _clutter_stage_has_device (ClutterStage *stage,
{ {
ClutterStagePrivate *priv = stage->priv; ClutterStagePrivate *priv = stage->priv;
if (priv->devices == NULL)
return FALSE;
return g_hash_table_lookup (priv->devices, device) != NULL; return g_hash_table_lookup (priv->devices, device) != NULL;
} }