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

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-03-26 02:12:21 +0200 (Thu, 26 Mar 2009)
New Revision: 17803

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: slight fixup of warnings in
	loop processing for events.



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-25 22:40:43 UTC (rev 17802)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-26 00:12:21 UTC (rev 17803)
@@ -1,5 +1,10 @@
 2009-03-25  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
+	* matchbox/core/mb-wm-main-context.c: slight fixup of warnings in
+	loop processing for events.
+
+2009-03-25  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
 	The next step from the reverted patch.  Crashes still not evident.
 
 	* matchbox/core/mb-wm-main-context.c: unify loop processing for events.

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-25 22:40:43 UTC (rev 17802)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-main-context.c	2009-03-26 00:12:21 UTC (rev 17803)
@@ -179,26 +179,29 @@
     {
       MBWMXEventFuncInfo *i = iter->data;
       Window msg_xwin = i->xwindow;
-      MBWMList * next = iter->next;
 
       if (msg_xwin == None || msg_xwin == xwin)
 	{
 	  if (!(i->func (event, i->userdata)))
-	      break;
+	    {
+	      MBWMXEventFuncInfo *breaker = i;
+	      iter = iter->next;
+
+	      /* This can get spammy. */
+	      while (iter)
+		{
+		  MBWMXEventFuncInfo *i = iter->data;
+		  
+		  g_warning ("Warning: Ignoring handler %p because of %p", i->func, breaker->func);
+		  iter = iter->next;
+		}
+	      
+	      return;
+	    }
 	}
 
       iter = iter->next;
     }
-
-  /* This can get spammy.
-  while (iter)
-    {
-      MBWMXEventFuncInfo *i = iter->data;
-
-      g_warning ("Warning: Ignoring handler %p", i->func);
-      iter = iter->next;
-    }
-  */
 }
 
 Bool