Update for recent multiscreen fixesmultiscreen

This is for: "Make focusDefaultWindow () take a CompScreen as argument"

2 files changed, 4 insertions, 4 deletions

diff --git a/src/put.c b/src/put.c
index 57bf978..af1d973 100644
--- a/src/put.c
+++ b/src/put.c
@@ -189,7 +189,7 @@ static void putPreparePaintScreen(CompScreen * s, int msSinceLastPaint)
 			{
 				/* unfocus moved window if enabled */
 				if (putGetUnfocusWindow(s))
-					focusDefaultWindow(s->display);
+					focusDefaultWindow(s);
 				break;
 			}
 		}
diff --git a/src/wall.c b/src/wall.c
index 76d4280..66e92af 100644
--- a/src/wall.c
+++ b/src/wall.c
@@ -705,7 +705,7 @@ static void wallHandleEvent(CompDisplay * d, XEvent * event)
 				while (s->y != ws->mouseOverViewY)
 					moveScreenViewport(s, 0, 1, TRUE);
 
-				focusDefaultWindow(s->display);
+				focusDefaultWindow(s);
 			}
 			damageScreen(s);
 		}
@@ -1127,7 +1127,7 @@ static Bool wallExpo(CompDisplay * d, CompAction * action,
 	}
 	damageScreen(s);
 
-	focusDefaultWindow(s->display);
+	focusDefaultWindow(s);
 
 	return TRUE;
 }
@@ -1684,7 +1684,7 @@ static void wallPreparePaintScreen(CompScreen * s, int ms)
 		if (ws->moveWindow)
 			wallReleaseMoveWindow(s);
 		else
-			focusDefaultWindow(s->display);
+			focusDefaultWindow(s);
 
 		if (ws->grabIndex)
 		{