brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input-device: Do not use weak references with actors

Browse Source 
Use the ClutterActor::destroy signal.
This commit is contained in:
Emmanuele Bassi 2012-02-13 08:52:08 +00:00
parent f024b852f9
commit 8f6da170bc
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clutter/clutter-input-device.c
View File

@ -422,16 +422,10 @@ _clutter_input_device_set_time (ClutterInputDevice *device,
device->current_time = time_; device->current_time = time_;
} }
/* #ClutterInputDevice keeps a weak reference on the actor
* under its pointer; this function unsets the reference on
* the actor to avoid keeping around stale pointers
*/
static void static void
cursor_weak_unref (gpointer user_data, on_cursor_actor_destroy (ClutterActor *actor,
GObject *object_pointer) ClutterInputDevice *device)
{ {
ClutterInputDevice *device = user_data;
device->cursor_actor = NULL; device->cursor_actor = NULL;
} }
@ -533,9 +527,9 @@ _clutter_input_device_set_actor (ClutterInputDevice *device,
if (device->cursor_actor != NULL) if (device->cursor_actor != NULL)
{ {
_clutter_actor_set_has_pointer (device->cursor_actor, FALSE); _clutter_actor_set_has_pointer (device->cursor_actor, FALSE);
g_object_weak_unref (G_OBJECT (device->cursor_actor), g_signal_handlers_disconnect_by_func (device->cursor_actor,
cursor_weak_unref, G_CALLBACK (on_cursor_actor_destroy),
device); device);
device->cursor_actor = NULL; device->cursor_actor = NULL;
} }
@ -567,9 +561,9 @@ _clutter_input_device_set_actor (ClutterInputDevice *device,
device->cursor_actor = actor; device->cursor_actor = actor;
if (device->cursor_actor != NULL) if (device->cursor_actor != NULL)
{ {
g_object_weak_ref (G_OBJECT (device->cursor_actor), g_signal_connect (device->cursor_actor,
cursor_weak_unref, "destroy", G_CALLBACK (on_cursor_actor_destroy),
device); device);
_clutter_actor_set_has_pointer (device->cursor_actor, TRUE); _clutter_actor_set_has_pointer (device->cursor_actor, TRUE);
} }
} }