xserver: Branch 'master' - 2 commits

[Daniel Stone]

 hw/xfree86/os-support/linux/lnx_acpi.c |    2 +-
 os/connection.c                        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree b5d09d4adb8088719ff494a4281a793717046576 (from 0567a6337b84fa045b5732e98203f488274aa2a2)
Author: Rich Coe <Richard.Coe at med.ge.com>
Date:   Wed Nov 8 18:10:14 2006 +0200

    CheckConnections: don't close down the server client (bug #7876)
    When an appgroup is shutting down, the list of clients can change, so make
    sure we're not trying to shut the server down.

diff --git a/os/connection.c b/os/connection.c
index 95c5500..100f1e5 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1045,7 +1045,7 @@ CheckConnections(void)
 	FD_ZERO(&tmask);
 	FD_SET(curclient, &tmask);
 	r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
-	if (r < 0)
+	if (r < 0 && GetConnectionTranslation(curclient) > 0)
 	    CloseDownClient(clients[GetConnectionTranslation(curclient)]);
     }	
 #endif
diff-tree 0567a6337b84fa045b5732e98203f488274aa2a2 (from e7900d68c3ee657158813f0650886d680c0a9a3c)
Author: Bram Verweij <amverweij at gmail.com>
Date:   Wed Nov 8 18:00:52 2006 +0200

    xfree86/linux acpi: fix tokenising
    Split on a space, rather on the 'video' string, as strtok takes a char,
    not a string.

diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
index aa30e72..024e6ef 100644
--- a/hw/xfree86/os-support/linux/lnx_acpi.c
+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
@@ -78,7 +78,7 @@ lnxACPIGetEventFromOs(int fd, pmEvent *e
 	char *data = NULL; /* doesn't appear to be used in the kernel */
 	unsigned long int notify_l, data_l;
 
-	video = strtok(ev, "video");
+	video = strtok(ev, " ");
 
 	GFX = strtok(NULL, " ");
 #if 0