diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-27 08:55:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-27 08:55:46 +0200 |
| commit | 0feab87a4300a3e204e259d14a0a63e58e4a3c8f (patch) | |
| tree | 0ff984b670b1409d8f665be20dfd8f410bdf2473 /apps/xwininfo/dsimple.c | |
| parent | 97c96ddb6f56be198c2e8bf04ff25bc7b48dd1f2 (diff) | |
| download | vcxsrv-0feab87a4300a3e204e259d14a0a63e58e4a3c8f.tar.gz vcxsrv-0feab87a4300a3e204e259d14a0a63e58e4a3c8f.tar.bz2 vcxsrv-0feab87a4300a3e204e259d14a0a63e58e4a3c8f.zip | |
xwininfo fontconfig mesa pixman git update 27 June 2011
Diffstat (limited to 'apps/xwininfo/dsimple.c')
| -rw-r--r-- | apps/xwininfo/dsimple.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/xwininfo/dsimple.c b/apps/xwininfo/dsimple.c index 150f9db84..d1b9fd903 100644 --- a/apps/xwininfo/dsimple.c +++ b/apps/xwininfo/dsimple.c @@ -236,7 +236,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 @@ -291,17 +291,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); @@ -351,7 +351,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); @@ -393,7 +393,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)); |