-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Dear,
I NMUed xlockmore 1:5.13-2.1 to fix RC #309760.
I checked Eugene's patch solved this bug.
Could you accept this for Sarge?
Format: 1.7
Date: Mon, 23 May 2005 11:30:18 +0000
Source: xlockmore
Binary: xlockmore xlockmore-gl
Architecture: source i386
Version: 1:5.13-2.1
Distribution: unstable
Urgency: high
Maintainer: Michael Stone <[EMAIL PROTECTED]>
Changed-By: Kenshi Muto <[EMAIL PROTECTED]>
Description:
xlockmore - Lock X11 display until password is entered.
xlockmore-gl - Lock X11 display until password is entered -- GL version
Closes: 309760
Changes:
xlockmore (1:5.13-2.1) unstable; urgency=high
.
* NMU
* Applied newest patch from Eugene to avoid fatal crash when fvwm
switches virtual desktop. (closes: #309760)
Files:
71c7f233ae05e902b882b127fafb1475 661 x11 optional xlockmore_5.13-2.1.dsc
90860c52f1d4ef13ba83a2027b3d4fba 33481 x11 optional xlockmore_5.13-2.1.diff.gz
a553904a3e575cd43fcddcab34397cf2 1010280 x11 optional
xlockmore-gl_5.13-2.1_i386.deb
45063025623be3323dd8bc128c114500 579762 x11 extra xlockmore_5.13-2.1_i386.deb
Patch is here (same as what Eugene created at #309760).
diff -urN o/xlockmore-5.13/debian/changelog xlockmore-5.13/debian/changelog
- --- o/xlockmore-5.13/debian/changelog 2005-05-23 11:27:10.916164409 +0000
+++ xlockmore-5.13/debian/changelog 2005-05-23 11:37:20.832519832 +0000
@@ -1,3 +1,11 @@
+xlockmore (1:5.13-2.1) unstable; urgency=high
+
+ * NMU
+ * Applied newest patch from Eugene to avoid fatal crash when fvwm
+ switches virtual desktop. (closes: #309760)
+
+ -- Kenshi Muto <[EMAIL PROTECTED]> Mon, 23 May 2005 11:30:18 +0000
+
xlockmore (1:5.13-2) unstable; urgency=low
* Correct instructions for dpkg-statoverride in README.Debian
diff -urN o/xlockmore-5.13/xlock/xlock.c xlockmore-5.13/xlock/xlock.c
- --- o/xlockmore-5.13/xlock/xlock.c 2004-06-17 02:20:30.000000000 +0000
+++ xlockmore-5.13/xlock/xlock.c 2005-05-23 11:37:20.826520753 +0000
@@ -2145,7 +2145,7 @@
/* next line for -geometry */
if (event.xvisibility.state !=
VisibilityUnobscured) {
/* window was restacked or exposed */
- - if (!debug && !inwindow)
+ if (!debug && !inwindow &&
event.xvisibility.window)
XRaiseWindow(dsp,
event.xvisibility.window);
call_refresh_hook((LockStruct *) NULL,
mode_info(dsp,
screen, Scr[screen].window, False));
@@ -2161,7 +2161,8 @@
break;
/* window config changed */
if (!debug && !inwindow) {
- - XRaiseWindow(dsp,
event.xconfigure.window);
+ if (event.xconfigure.window)
+ XRaiseWindow(dsp,
event.xconfigure.window);
fixColormap(mode_info(dsp, screen,
Scr[screen].window, False), ncolors,
saturation, mono, install,
inroot, inwindow, verbose);
}
@@ -2760,7 +2761,7 @@
/* fall through on last expose event of the
series */
case VisibilityNotify:
- - if (!debug && !inwindow) {
+ if (!debug && !inwindow && event.xany.window) {
XRaiseWindow(display,
event.xany.window);
}
for (screen = startscreen; screen < screens;
screen++) {
@@ -2770,7 +2771,7 @@
break;
case ConfigureNotify:
- - if (!debug && !inwindow) {
+ if (!debug && !inwindow &&
event.xconfigure.window) {
XRaiseWindow(display,
event.xconfigure.window);
}
Regards,
- --
Kenshi Muto
[EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>
iEYEARECAAYFAkKR0b4ACgkQQKW+7XLQPLH2FgCg4pvtsz5JGY3UFXJaOPc5AzR2
4ZUAoK59KZlVSp/5i5cpJ9ayTtd/yg0C
=EGSr
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
