diff --git a/ChangeLog b/ChangeLog
index 10621ec6c..a3c188e8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-23  Matthew Allum  <mallum@openedhand.com>
+
+        Bug 987 - clutter-event.c c99 variable declaration
+
+	* clutter/clutter-event.c:
+        Remove c99ism.
+
 2008-06-23  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* configure.ac: Post release bump to 0.7.3.
diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index 2ac3ea653..7f712249c 100644
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -327,10 +327,10 @@ clutter_keysym_to_unicode (guint keyval)
 gint
 clutter_event_get_device_id (ClutterEvent *event)
 {
-  g_return_val_if_fail (-1, event != NULL);
-
   ClutterInputDevice *device = NULL;
 
+  g_return_val_if_fail (-1, event != NULL);
+
   switch (event->type)
     {
     case CLUTTER_NOTHING: