summaryrefslogtreecommitdiff
path: root/libwnck/xutils.c
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2011-01-19 22:54:08 +0100
committerVincent Untz <vuntz@gnome.org>2011-01-20 14:48:36 +0100
commit7c9f9636a4dc864d7c8d1d099a49209f5736d56c (patch)
treeb65bd32c37c15822356198b1fd7b1ee097488a42 /libwnck/xutils.c
parent693b348b339224646a59d87536a2c806b058d37a (diff)
downloadlibwnck-7c9f9636a4dc864d7c8d1d099a49209f5736d56c.tar.gz
core: Add Screen argument to _wnck_get_atom_list()
Diffstat (limited to 'libwnck/xutils.c')
-rw-r--r--libwnck/xutils.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index d123b06..620d1b5 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -465,11 +465,13 @@ _wnck_get_window_list (Screen *screen,
}
gboolean
-_wnck_get_atom_list (Window xwindow,
+_wnck_get_atom_list (Screen *screen,
+ Window xwindow,
Atom atom,
Atom **atoms,
int *len)
{
+ Display *display;
Atom type;
int format;
gulong nitems;
@@ -477,12 +479,14 @@ _wnck_get_atom_list (Window xwindow,
Atom *data;
int err, result;
+ display = DisplayOfScreen (screen);
+
*atoms = NULL;
*len = 0;
_wnck_error_trap_push ();
type = None;
- result = XGetWindowProperty (_wnck_get_default_display(),
+ result = XGetWindowProperty (display,
xwindow,
atom,
0, G_MAXLONG,