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

[Vincent Untz <vuntz src gnome org>]

commit 41fa40e562133f2486b3134cf650f333a8db6a58
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Jan 19 23:42:43 2011 +0100

    core: Add Screen argument to _wnck_set_icon_geometry()

 libwnck/window.c |    3 ++-
 libwnck/xutils.c |   16 ++++++++++------
 libwnck/xutils.h |   11 ++++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/libwnck/window.c b/libwnck/window.c
index a147c89..ce10c3e 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -2380,7 +2380,8 @@ wnck_window_set_icon_geometry (WnckWindow *window,
   window->priv->icon_geometry.width = width;
   window->priv->icon_geometry.height = height;
 
-  _wnck_set_icon_geometry (window->priv->xwindow,
+  _wnck_set_icon_geometry (WNCK_SCREEN_XSCREEN (window->priv->screen),
+                           window->priv->xwindow,
                            x, y, width, height);
 }
 
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 8c35dab..f20f61c 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -2390,14 +2390,18 @@ _wnck_get_window_position (Screen *screen,
 }
 
 void
-_wnck_set_icon_geometry  (Window xwindow,
-			  int    x,
-			  int    y,
-			  int    width,
-			  int    height)
+_wnck_set_icon_geometry  (Screen *screen,
+                          Window  xwindow,
+			  int     x,
+			  int     y,
+			  int     width,
+			  int     height)
 {
+  Display *display;
   gulong data[4];
 
+  display = DisplayOfScreen (screen);
+
   data[0] = x;
   data[1] = y;
   data[2] = width;
@@ -2405,7 +2409,7 @@ _wnck_set_icon_geometry  (Window xwindow,
 
   _wnck_error_trap_push ();
 
-  XChangeProperty (_wnck_get_default_display (),
+  XChangeProperty (display,
 		   xwindow,
 		   _wnck_atom_get ("_NET_WM_ICON_GEOMETRY"),
 		   XA_CARDINAL, 32, PropModeReplace,
diff --git a/libwnck/xutils.h b/libwnck/xutils.h
index 502ecf3..7f337a9 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -206,11 +206,12 @@ void _wnck_get_window_position (Screen *screen,
                                 int    *xp,
                                 int    *yp);
 
-void _wnck_set_icon_geometry  (Window xwindow,
-			       int    x,
-			       int    y,
-			       int    width,
-			       int    height);
+void _wnck_set_icon_geometry  (Screen *screen,
+                               Window  xwindow,
+			       int     x,
+			       int     y,
+			       int     width,
+			       int     height);
 
 void _wnck_set_desktop_layout (Screen *xscreen,
                                int     rows,