From 9106ea0d2ba0ae4ab945dee7464f864f7bc4e49c Mon Sep 17 00:00:00 2001 From: David Reveman Date: Wed, 8 Oct 2008 12:30:40 -0400 Subject: Don't enter back-end dispatch from here. --- hw/dmx/dmxatom.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/hw/dmx/dmxatom.c b/hw/dmx/dmxatom.c index 0afe3f101..74da52e05 100644 --- a/hw/dmx/dmxatom.c +++ b/hw/dmx/dmxatom.c @@ -41,21 +41,13 @@ dmxAtom (DMXScreenInfo *dmxScreen, if (!atom) { - xcb_get_atom_name_cookie_t cookie; - xcb_get_atom_name_reply_t *reply = NULL; - - cookie = xcb_get_atom_name (dmxScreen->connection, beAtom); - - do { - dmxDispatch (); - - if (xcb_poll_for_reply (dmxScreen->connection, - cookie.sequence, - (void **) &reply, - NULL)) - break; - } while (dmxWaitForResponse () && dmxScreen->alive); + xcb_get_atom_name_reply_t *reply; + reply = + xcb_get_atom_name_reply (dmxScreen->connection, + xcb_get_atom_name (dmxScreen->connection, + beAtom), + NULL); if (!reply) return None; @@ -100,29 +92,19 @@ dmxBEAtom (DMXScreenInfo *dmxScreen, if (!beAtom) { - xcb_intern_atom_cookie_t cookie; - xcb_intern_atom_reply_t *reply = NULL; - char *name; + xcb_intern_atom_reply_t *reply; + char *name; name = NameForAtom (atom); if (!name) return None; - cookie = xcb_intern_atom (dmxScreen->connection, - FALSE, - strlen (name), - name); - - do { - dmxDispatch (); - - if (xcb_poll_for_reply (dmxScreen->connection, - cookie.sequence, - (void **) &reply, - NULL)) - break; - } while (dmxWaitForResponse () && dmxScreen->alive); - + reply = xcb_intern_atom_reply (dmxScreen->connection, + xcb_intern_atom (dmxScreen->connection, + FALSE, + strlen (name), + name), + NULL); if (!reply) return None; -- cgit v1.2.3