tests: update for xcb-util >= 0.3.0

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/configure.ac b/configure.ac
index de7dd86..d4c4c01 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ dnl AM_PROG_LIBTOOL
 dnl AC_PROG_MAKE_SET
 
 PKG_CHECK_MODULES(XCB, xcb)
-PKG_CHECK_MODULES(XCBAUX, xcb-aux)
-PKG_CHECK_MODULES(XCBIMAGE, xcb-image)
-PKG_CHECK_MODULES(XCBICCCM, xcb-icccm)
+PKG_CHECK_MODULES(XCBAUX, xcb-aux >= 0.3.0)
+PKG_CHECK_MODULES(XCBIMAGE, xcb-image >= 0.3.0)
+PKG_CHECK_MODULES(XCBICCCM, xcb-icccm >= 0.3.0)
 PKG_CHECK_MODULES(XCBDPMS, xcb-dpms)
 PKG_CHECK_MODULES(XCBRENDER, xcb-render)
 PKG_CHECK_MODULES(XCBRANDR, xcb-randr)

diff --git a/tests/flames.c b/tests/flames.c
index ccf77a4..59bfbdf 100644 (file)
--- a/tests/flames.c
+++ b/tests/flames.c
@@ -231,11 +231,12 @@ main ()
   flame_set_random_flame_base (f);
 
   xcb_atom_t deleteWindowAtom = get_atom(f->xcb.c, "WM_DELETE_WINDOW");
+  xcb_atom_t wmprotocolsAtom = get_atom(f->xcb.c, "WM_PROTOCOLS");
   /* Listen to X client messages in order to be able to pickup
      the "delete window" message that is generated for example
      when someone clicks the top-right X button within the window
      manager decoration (or when user hits ALT-F4). */
-  xcb_set_wm_protocols (f->xcb.c, f->xcb.draw, 1, &deleteWindowAtom);
+  xcb_set_wm_protocols (f->xcb.c, wmprotocolsAtom, f->xcb.draw, 1, &deleteWindowAtom);
 
   bool finished = false;
   while (!finished)

diff --git a/tests/julia.c b/tests/julia.c
index eec6de5..ebdc11f 100644 (file)
--- a/tests/julia.c
+++ b/tests/julia.c
@@ -202,11 +202,12 @@ main (int argc, char *argv[])
   palette_julia (&data);
 
   xcb_atom_t deleteWindowAtom = get_atom(data.conn, "WM_DELETE_WINDOW");
+  xcb_atom_t wmprotocolsAtom = get_atom(data.conn, "WM_PROTOCOLS");
   /* Listen to X client messages in order to be able to pickup
      the "delete window" message that is generated for example
      when someone clicks the top-right X button within the window
      manager decoration (or when user hits ALT-F4). */
-  xcb_set_wm_protocols (data.conn, data.draw, 1, &deleteWindowAtom);
+  xcb_set_wm_protocols (data.conn, wmprotocolsAtom, data.draw, 1, &deleteWindowAtom);
 
   xcb_flush (data.conn);