summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2015-04-09 14:50:36 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2015-04-10 21:09:41 +0000
commit364905b59242084ba468d7fc52ab8ee4f889654c (patch)
tree4e65ad49fc5ead22b9a9d82e078ec8db37b9be4c /src
parent4ecae86e4b44c564e0f9b0e869e85f1c9febbdb4 (diff)
xcb: Fix getting of virtual roots
Update QXcbWMSupport::net_virtual_roots instead of QXcbWMSupport::net_wm_atoms. It's a copy/paste error. Change-Id: If146955d954850f02980f473ad2318d67f193ec9 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/xcb/qxcbwmsupport.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.cpp b/src/plugins/platforms/xcb/qxcbwmsupport.cpp
index bcdfde2ef9..7d31ac7118 100644
--- a/src/plugins/platforms/xcb/qxcbwmsupport.cpp
+++ b/src/plugins/platforms/xcb/qxcbwmsupport.cpp
@@ -68,7 +68,7 @@ void QXcbWMSupport::updateNetWMAtoms()
remaining = 0;
if (reply->type == XCB_ATOM_ATOM && reply->format == 32) {
- int len = xcb_get_property_value_length(reply)/4;
+ int len = xcb_get_property_value_length(reply)/sizeof(xcb_atom_t);
xcb_atom_t *atoms = (xcb_atom_t *)xcb_get_property_value(reply);
int s = net_wm_atoms.size();
net_wm_atoms.resize(s + len);
@@ -102,11 +102,11 @@ void QXcbWMSupport::updateVirtualRoots()
remaining = 0;
if (reply->type == XCB_ATOM_ATOM && reply->format == 32) {
- int len = xcb_get_property_value_length(reply)/4;
- xcb_atom_t *atoms = (xcb_atom_t *)xcb_get_property_value(reply);
- int s = net_wm_atoms.size();
- net_wm_atoms.resize(s + len);
- memcpy(net_wm_atoms.data() + s, atoms, len*sizeof(xcb_atom_t));
+ int len = xcb_get_property_value_length(reply)/sizeof(xcb_window_t);
+ xcb_window_t *roots = (xcb_window_t *)xcb_get_property_value(reply);
+ int s = net_virtual_roots.size();
+ net_virtual_roots.resize(s + len);
+ memcpy(net_virtual_roots.data() + s, roots, len*sizeof(xcb_window_t));
remaining = reply->bytes_after;
offset += len;