From 06ba1c0e65a8bbf5b06a14c4bc0045e23f83619d Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 17 Aug 2011 01:32:29 +0200 Subject: [PATCH] Fix compilation with xcb 0.3.6 --- i3bar/include/xcb.h | 4 ++++ i3bar/include/xcb_atoms.def | 1 - i3bar/src/xcb.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h index 0276d3c7..c1b7cc14 100644 --- a/i3bar/include/xcb.h +++ b/i3bar/include/xcb.h @@ -12,6 +12,10 @@ #include //#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 0c0b207e..b75ceabd 100644 --- 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 00d25272..e25bc959 100644 --- 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); -- 2.39.5