[patch] proposed patch, fixes compilation with xcb-util-0.3.8

xlsclients-xcb-util-defines.patch (text/plain), 1.68 KB, created by Federico Cuello on 2011-04-26 18:15:17 UTC

--- xlsclients-1.1.1/xlsclients.c.orig	2009-10-21 16:53:34.000000000 -0300
+++ xlsclients-1.1.1/xlsclients.c	2011-04-26 15:08:37.821602007 -0300
@@ -433,7 +433,7 @@
     int i;
 
     /*
-     * get the WM_MACHINE and WM_COMMAND list of strings
+     * get the WM_CLIENT_MACHINE and WM_COMMAND list of strings
      */
     client_machine = xcb_get_property_reply(cs->c, cs->client_machine, NULL);
     command = xcb_get_property_reply(cs->c, cs->command, NULL);
@@ -539,21 +539,21 @@
      * get the WM_CLIENT_MACHINE and WM_COMMAND list of strings
      */
     cs->client_machine = xcb_get_property(dpy, 0, w,
-			    WM_CLIENT_MACHINE, XCB_GET_PROPERTY_TYPE_ANY,
+			    XCB_ATOM_WM_CLIENT_MACHINE, XCB_GET_PROPERTY_TYPE_ANY,
 			    0, 1000000L);
     cs->command = xcb_get_property(dpy, 0, w,
-			    WM_COMMAND, XCB_GET_PROPERTY_TYPE_ANY,
+			    XCB_ATOM_WM_COMMAND, XCB_GET_PROPERTY_TYPE_ANY,
 			    0, 1000000L);
 
     if (verbose) {
 	cs->name = xcb_get_property(dpy, 0, w,
-			    WM_NAME, XCB_GET_PROPERTY_TYPE_ANY,
+			    XCB_ATOM_WM_NAME, XCB_GET_PROPERTY_TYPE_ANY,
 			    0, 1000000L);
 	cs->icon_name = xcb_get_property(dpy, 0, w,
-			    WM_ICON_NAME, XCB_GET_PROPERTY_TYPE_ANY,
+			    XCB_ATOM_WM_ICON_NAME, XCB_GET_PROPERTY_TYPE_ANY,
 			    0, 1000000L);
 	cs->wm_class = xcb_get_property(dpy, 0, w,
-			    WM_CLASS, STRING,
+			    XCB_ATOM_WM_CLASS, XCB_ATOM_STRING,
 			    0, 1000000L);
     }
 
@@ -569,7 +569,7 @@
     }
 
     if (s) printf ("%s", s);
-    if (tp->type == STRING && tp->format == 8) {
+    if (tp->type == XCB_ATOM_STRING && tp->format == 8) {
 	printf ("%.*s", (int)tp->value_len, (char *)xcb_get_property_value(tp));
     } else {
 	unknown (dpy, tp->type, tp->format);