aboutsummaryrefslogtreecommitdiff
path: root/apps/xwininfo/dsimple.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/xwininfo/dsimple.c')
-rw-r--r--apps/xwininfo/dsimple.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/xwininfo/dsimple.c b/apps/xwininfo/dsimple.c
index 63260661c..8a5d7cbeb 100644
--- a/apps/xwininfo/dsimple.c
+++ b/apps/xwininfo/dsimple.c
@@ -237,7 +237,7 @@ struct wininfo_cookies {
};
#ifndef USE_XCB_ICCCM
-# define xcb_get_wm_name(Dpy, Win) \
+# define xcb_icccm_get_wm_name(Dpy, Win) \
xcb_get_property (Dpy, False, Win, XCB_ATOM_WM_NAME, \
XCB_GET_PROPERTY_TYPE_ANY, 0, BUFSIZ)
#endif
@@ -292,17 +292,17 @@ recursive_Window_With_Name (
xcb_discard_reply (dpy, cookies->get_wm_name.sequence);
} else {
#ifdef USE_XCB_ICCCM
- xcb_get_text_property_reply_t nameprop;
+ xcb_icccm_get_text_property_reply_t nameprop;
- if (xcb_get_wm_name_reply (dpy, cookies->get_wm_name,
- &nameprop, &err)) {
+ if (xcb_icccm_get_wm_name_reply (dpy, cookies->get_wm_name,
+ &nameprop, &err)) {
/* can't use strcmp, since nameprop.name is not null terminated */
if ((namelen == nameprop.name_len) &&
memcmp (nameprop.name, name, namelen) == 0) {
w = window;
}
- xcb_get_text_property_reply_wipe (&nameprop);
+ xcb_icccm_get_text_property_reply_wipe (&nameprop);
}
#else
prop = xcb_get_property_reply (dpy, cookies->get_wm_name, &err);
@@ -352,7 +352,7 @@ recursive_Window_With_Name (
if (atom_net_wm_name && atom_utf8_string)
child_cookies[i].get_net_wm_name =
xcb_get_net_wm_name (dpy, children[i]);
- child_cookies[i].get_wm_name = xcb_get_wm_name (dpy, children[i]);
+ child_cookies[i].get_wm_name = xcb_icccm_get_wm_name (dpy, children[i]);
child_cookies[i].query_tree = xcb_query_tree (dpy, children[i]);
}
xcb_flush (dpy);
@@ -394,7 +394,7 @@ Window_With_Name (
if (atom_net_wm_name && atom_utf8_string)
cookies.get_net_wm_name = xcb_get_net_wm_name (dpy, top);
- cookies.get_wm_name = xcb_get_wm_name (dpy, top);
+ cookies.get_wm_name = xcb_icccm_get_wm_name (dpy, top);
cookies.query_tree = xcb_query_tree (dpy, top);
xcb_flush (dpy);
return recursive_Window_With_Name(dpy, top, &cookies, name, strlen(name));