summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2015-06-23 15:33:58 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2015-06-23 15:37:58 -0700
commit3962f1d982f2c6147075591c33e707d7d4c98999 (patch)
tree89cc1016581413be9dd37d74f80a8939c941e798
parent414be07a69cacfa5bf26405604362d9dc522e3c4 (diff)
downloadmutter-3962f1d982f2c6147075591c33e707d7d4c98999.tar.gz
xprops: Apply the same Xlib / 64-bit hygiene to atom lists
-rw-r--r--src/x11/xprops.c4
-rw-r--r--src/x11/xprops.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/x11/xprops.c b/src/x11/xprops.c
index 2dea2869a..fb9cc2041 100644
--- a/src/x11/xprops.c
+++ b/src/x11/xprops.c
@@ -241,13 +241,13 @@ get_property (MetaDisplay *display,
static gboolean
atom_list_from_results (GetPropertyResults *results,
- Atom **atoms_p,
+ uint32_t **atoms_p,
int *n_atoms_p)
{
if (!validate_or_free_results (results, 32, XA_ATOM, FALSE))
return FALSE;
- *atoms_p = (Atom*) results->prop;
+ *atoms_p = (uint32_t*) results->prop;
*n_atoms_p = results->n_items;
results->prop = NULL;
diff --git a/src/x11/xprops.h b/src/x11/xprops.h
index 7500c3478..17a08ceb5 100644
--- a/src/x11/xprops.h
+++ b/src/x11/xprops.h
@@ -170,8 +170,8 @@ typedef struct
struct
{
- Atom *atoms;
- int n_atoms;
+ uint32_t *atoms;
+ int n_atoms;
} atom_list;
} v;