Fix compilation with xcb 0.3.6

diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index 0276d3c7b7c04e5029fe00f96b1626efd13dede0..c1b7cc14e3575bd98051ddd3040b89af16fd90aa 100644 (file)
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -12,6 +12,10 @@
 #include <stdint.h>
 //#include "outputs.h"
 
+#ifdef XCB_COMPAT
+#define XCB_ATOM_CARDINAL CARDINAL
+#endif
+
 #define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
 #define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1
 #define SYSTEM_TRAY_REQUEST_DOCK    0

diff --git a/i3bar/include/xcb_atoms.def b/i3bar/include/xcb_atoms.def
index 0c0b207ea2d90251237e8307470e9ad75d6b12de..b75ceabd538afa3a96aba1fb87fd1a23f06a6403 100644 (file)
--- a/i3bar/include/xcb_atoms.def
+++ b/i3bar/include/xcb_atoms.def
@@ -5,7 +5,6 @@ ATOM_DO(I3_SOCKET_PATH)
 ATOM_DO(MANAGER)
 ATOM_DO(_NET_SYSTEM_TRAY_ORIENTATION)
 ATOM_DO(_NET_SYSTEM_TRAY_VISUAL)
-ATOM_DO(CARDINAL)
 ATOM_DO(_NET_SYSTEM_TRAY_OPCODE)
 ATOM_DO(_XEMBED_INFO)
 ATOM_DO(_XEMBED)

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 00d25272ebf173c1e703cd695890a9083b0acf2d..e25bc95977b2e751cf1e85cccba6c5986d4c530e 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -930,7 +930,7 @@ void init_tray() {
                         XCB_PROP_MODE_REPLACE,
                         selwin,
                         atoms[_NET_SYSTEM_TRAY_ORIENTATION],
-                        atoms[CARDINAL],
+                        XCB_ATOM_CARDINAL,
                         32,
                         1,
                         &orientation);