[libwnck] core: Add Screen argument to _wnck_get_atom_list()

[Vincent Untz <vuntz src gnome org>]

commit 7c9f9636a4dc864d7c8d1d099a49209f5736d56c
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Jan 19 22:54:08 2011 +0100

    core: Add Screen argument to _wnck_get_atom_list()

 libwnck/window.c |    9 ++++++---
 libwnck/xutils.c |    8 ++++++--
 libwnck/xutils.h |    3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/libwnck/window.c b/libwnck/window.c
index dd79f1c..376ddef 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -2647,7 +2647,8 @@ update_state (WnckWindow *window)
 
       atoms = NULL;
       n_atoms = 0;
-      _wnck_get_atom_list (window->priv->xwindow,
+      _wnck_get_atom_list (WNCK_SCREEN_XSCREEN (window->priv->screen),
+                           window->priv->xwindow,
                            _wnck_atom_get ("_NET_WM_STATE"),
                            &atoms, &n_atoms);
 
@@ -2835,7 +2836,8 @@ update_actions (WnckWindow *window)
 
   atoms = NULL;
   n_atoms = 0;
-  if (!_wnck_get_atom_list (window->priv->xwindow,
+  if (!_wnck_get_atom_list (WNCK_SCREEN_XSCREEN (window->priv->screen),
+                            window->priv->xwindow,
                             _wnck_atom_get ("_NET_WM_ALLOWED_ACTIONS"),
                             &atoms,
                             &n_atoms))
@@ -2943,7 +2945,8 @@ update_wintype (WnckWindow *window)
 
   atoms = NULL;
   n_atoms = 0;
-  if (_wnck_get_atom_list (window->priv->xwindow,
+  if (_wnck_get_atom_list (WNCK_SCREEN_XSCREEN (window->priv->screen),
+                           window->priv->xwindow,
                            _wnck_atom_get ("_NET_WM_WINDOW_TYPE"),
                            &atoms,
                            &n_atoms))
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,
diff --git a/libwnck/xutils.h b/libwnck/xutils.h
index be52f32..0e86789 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -67,7 +67,8 @@ gboolean _wnck_get_window_list   (Screen  *screen,
                                   Atom     atom,
                                   Window **windows,
                                   int     *len);
-gboolean _wnck_get_atom_list     (Window   xwindow,
+gboolean _wnck_get_atom_list     (Screen  *screen,
+                                  Window   xwindow,
                                   Atom     atom,
                                   Atom   **atoms,
                                   int     *len);