[maemo-commits] [maemo-commits] r18098 - in projects/haf/trunk/clutter0.8: clutter debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-04-17 13:46:44 +0300 (Fri, 17 Apr 2009)
New Revision: 18098

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
Modified clutter_actor_destroy to not use g_return_if_fail


Modified: projects/haf/trunk/clutter0.8/clutter/clutter-actor.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-04-17 08:40:16 UTC (rev 18097)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-actor.c	2009-04-17 10:46:44 UTC (rev 18098)
@@ -3006,7 +3006,11 @@
 {
   ClutterActorPrivate *priv;
 
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
+  if (!CLUTTER_IS_ACTOR (self))
+    {
+      g_critical("%s: CLUTTER_IS_ACTOR(%p) FAILED", __FUNCTION__, self);
+      return;
+    }
 
   priv = self->priv;
 

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-04-17 08:40:16 UTC (rev 18097)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-04-17 10:46:44 UTC (rev 18098)
@@ -2,6 +2,7 @@
 
   * Modified clutter_id_pool_lookup to not segfault if the ID is not in the 
     pool, and if g_return_if_fail is undefined. Fixes NB#111366
+  * Modified clutter_actor_destroy to not use g_return_if_fail
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Thu, 16 Apr 2009 13:32:59 +0300