author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Tue, 08 Mar 2016 09:00:31 -0800 | |
changeset 5561 | 0416d82f7f55 |
parent 5400 | components/desktop/xscreensaver/patches/17-bug-15411306.patch@1199f8e91f50 |
permissions | -rw-r--r-- |
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
1 |
From 31822e934b170581ecab2ffe79ce7e6ed5a189d9 Mon Sep 17 00:00:00 2001 |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
2 |
From: Alan Coopersmith <[email protected]> |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
3 |
Date: Sat, 2 Jan 2016 22:58:56 -0800 |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
4 |
Subject: [PATCH] bug 15411306 |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
5 |
|
5400
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
15411306 SUNBT6583247 JDS session is accessible for a while before |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
xscreensaver lock is displayed on hotdesking |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
|
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
Upstream applicability & status unknown. |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
--- |
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
11 |
driver/windows.c | 1 + |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
12 |
1 file changed, 1 insertion(+) |
5400
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
|
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
diff --git a/driver/windows.c b/driver/windows.c |
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
15 |
index 51e4c6a..4545ad7 100644 |
5400
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
16 |
--- a/driver/windows.c |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ b/driver/windows.c |
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
18 |
@@ -1581,6 +1581,7 @@ raise_window (saver_info *si, |
5400
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
19 |
if (!dont_clear || ssi->stderr_overlay_window) |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
clear_stderr (ssi); |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
XMapRaised (si->dpy, ssi->screensaver_window); |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
+ XSync(si->dpy,False); /* make sure window is raised now. */ |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
#ifdef HAVE_MIT_SAVER_EXTENSION |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
if (ssi->server_mit_saver_window && |
1199f8e91f50
22592978 Move xscreensaver to the Userland gate
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
window_exists_p (si->dpy, ssi->server_mit_saver_window)) |
5561
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
26 |
-- |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
27 |
2.6.1 |
0416d82f7f55
22593000 Upgrade xscreensaver to version 5.34
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
5400
diff
changeset
|
28 |