Merge lp:~oif-team/geis/lp_656503 into lp:geis

[Stephen M. Webb]

Fixes a logic error that can cause an infinite loop under exceptional circumstances.

[Henrik Rydberg (rydberg)]

I think the commit unnecessarily mixes cosmetic printout changes with the important bug fix.

review: Needs Fixing

[Duncan McGreggor (oubiwann)]

Stephen, sorry to be such a pain about this, but I do agree with Henrik. I encourage folks to create more branches. It seems like unecessary overhead, but it makes the code history easier to read and allows for very easy rollbacks in the event of any regressions. For instance, if a week later we had to revert the bug fix, we could (without even thinking about it) keep the formatting changes you made since they would have been in a separate merge.

Thanks!

review: Needs Fixing

[Henrik Rydberg (rydberg)]

Why is the version bumped for this bugfix? It seems to me it is a correction to the current one, rather?

review: Needs Fixing

[Stephen M. Webb (bregma)]

Version of what? Do you mean the library revision? That's so you can differentiate a library with the fix from a library without the fix (the purpose of .so versioning). This rule 3 for determinig library version information as documented with libtool.

Or are you referring to some other version bump?

[Henrik Rydberg (rydberg)]

I meant the library yes, and you are apparently ahead of me on versioning, so no argument then. :-)

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2010-09-30 18:06:42 +0000
+++ ChangeLog	2010-10-08 12:44:41 +0000
@@ -1,3 +1,11 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Fixed LP: #656503 - event dispatch can hang under some circumstances
+
+  * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch): changed loop condition
+  * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_LDFLAGS): bumped library
+    revision
+
 2010-09-28  Stephen M. Webb  <[e-mail]>
 
   Version bump to 1.0.12.

=== modified file 'libutouch-geis-xcb/Makefile.am'
--- libutouch-geis-xcb/Makefile.am	2010-09-14 11:39:59 +0000
+++ libutouch-geis-xcb/Makefile.am	2010-10-08 12:44:41 +0000
@@ -36,7 +36,7 @@
 
 libutouch_geis_la_LDFLAGS = \
 	-Wl,-z,defs -Wl,--as-needed \
-	-version-info 1:1:0 \
+	-version-info 1:2:0 \
 	-Wl,--version-script=$(version_script)
 
 libutouch_geis_la_LIBADD = \

=== modified file 'libutouch-geis-xcb/geis_xcb.c'
--- libutouch-geis-xcb/geis_xcb.c	2010-08-31 17:24:57 +0000
+++ libutouch-geis-xcb/geis_xcb.c	2010-10-08 12:44:41 +0000
@@ -733,9 +733,9 @@
   {
     const xcb_query_extension_reply_t *extension_info;
     extension_info = xcb_get_extension_data(xcb->connection, &xcb_gesture_id);
+    xcb_generic_event_t *event = NULL;
 
-    xcb_generic_event_t *event = xcb_poll_for_event(xcb->connection);
-    while (event)
+    while (event = xcb_poll_for_event(xcb->connection))
     {
       xcb_gesture_notify_event_t *gesture_event = NULL;
       if (event->response_type != GenericEvent) {
@@ -770,8 +770,6 @@
       {
 	geis_xcb_dispatch_gesture(instance, gesture_event);
       }
-
-      event = xcb_poll_for_event(xcb->connection);
     }
   }
 }