[maemo-commits] [maemo-commits] r17810 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-03-26 15:51:39 +0200 (Thu, 26 Mar 2009)
New Revision: 17810

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c
Log:
	* matchbox/core/mb-wm-main-context.c: apparently sometimes someone
	adds a null handler; protect against this.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-26 13:37:11 UTC (rev 17809)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-26 13:51:39 UTC (rev 17810)
@@ -1,3 +1,8 @@
+2009-03-26  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	* matchbox/core/mb-wm-main-context.c: apparently sometimes someone
+	adds a null handler; protect against this.
+
 2009-03-25  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	* matchbox/core/mb-wm-main-context.c: don't allow event handlers

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c	2009-03-26 13:37:11 UTC (rev 17809)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c	2009-03-26 13:51:39 UTC (rev 17810)
@@ -178,9 +178,8 @@
   while (iter)
     {
       MBWMXEventFuncInfo *i = iter->data;
-      Window msg_xwin = i->xwindow;
 
-      if (msg_xwin == None || msg_xwin == xwin)
+      if (i && (i->xwindow == None || i->xwindow == xwin))
 	{
 	  if (!i->func (event, i->userdata))
 	    {