[maemo-commits] [maemo-commits] r18533 - in projects/haf/trunk/libmatchbox2: . matchbox/comp-mgr

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-29 09:48:57 +0300 (Fri, 29 May 2009)
New Revision: 18533

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
patch from Laszlo for NB#115253


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-28 17:45:20 UTC (rev 18532)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-29 06:48:57 UTC (rev 18533)
@@ -1,3 +1,10 @@
+2009-05-29  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Apply patch from Laszlo Pere for NB#115253.
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_client_get_actor): Fix the NULL checking.
+
 2009-05-28  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	* configure.ac: Remove -O0 flag from compilation options, it is set

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-05-28 17:45:20 UTC (rev 18532)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-05-29 06:48:57 UTC (rev 18533)
@@ -344,6 +344,7 @@
     }
 
   free (cclient->priv);
+  cclient->priv = NULL;
 }
 
 int
@@ -446,7 +447,7 @@
 ClutterActor *
 mb_wm_comp_mgr_clutter_client_get_actor (MBWMCompMgrClutterClient *cclient)
 {
-  return cclient->priv->actor ? cclient->priv->actor : NULL;
+  return cclient && cclient->priv ? cclient->priv->actor : NULL;
 }