diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-31 17:14:04 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-31 17:14:04 -0700 |
| commit | da64006eb55443fef2262130b3a998755eeec3ae (patch) | |
| tree | 5f7c4f585830f73d91e7a95272814daa2c661644 | |
| parent | 7dcb9b1bac6a3394119619df3f54f14069f964bd (diff) | |
| parent | 3044711412d0a08ba65a491bd2441c0c8980f5e2 (diff) | |
Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple
| -rw-r--r-- | Xext/xtest.c | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index 9fb4be3c1..34d4ed69c 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -382,6 +382,7 @@ ProcXTestFakeInput(client) if (screenIsSaved == SCREEN_SAVER_ON) dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); + OsBlockSignals(); GetEventList(&events); switch(type) { case MotionNotify: @@ -400,7 +401,6 @@ ProcXTestFakeInput(client) break; } - OsBlockSignals(); for (i = 0; i < nevents; i++) mieqEnqueue(dev, (events+i)->event); OsReleaseSignals(); diff --git a/configure.ac b/configure.ac index f36216647..b3ee40470 100644 --- a/configure.ac +++ b/configure.ac @@ -26,12 +26,12 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.6.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE -RELEASE_DATE="2009-7-31" +RELEASE_DATE="2009-8-25" dnl this gets generated by autoheader, and thus contains all the defines. we dnl don't ever actually use it, internally. |