From e83a7851ad2cf64e778465620b23fe3c111c7164 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Thu, 19 May 2011 10:46:24 -0400
Subject: [PATCH] clutter-id-pool: fix warning on bad pick

Commit 13ac1fe7 purported to extend the _clutter_id_pool_lookup()
warning to the case where the id referred to a deleted actor, but did
not actually do so, because _clutter_id_pool_remove() set deleted IDs
to 0xdecafbad, not NULL. Fix this.

https://bugzilla.gnome.org/show_bug.cgi?id=650597
---
 clutter/clutter-id-pool.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/clutter/clutter-id-pool.c b/clutter/clutter-id-pool.c
index 9978cb03a..bd224f3e7 100644
--- a/clutter/clutter-id-pool.c
+++ b/clutter/clutter-id-pool.c
@@ -101,8 +101,7 @@ _clutter_id_pool_remove (ClutterIDPool *id_pool,
 
   array = (void*) id_pool->array->data;
 
-  /* set pointer to a recognizably voided value */
-  array[id_] = (void*)0xdecafbad;
+  array[id_] = NULL;
 
   id_pool->free_ids = g_slist_prepend (id_pool->free_ids,
                                        GUINT_TO_POINTER (id_));