xserver: Branch 'server-1.9-branch' - 2 commits

[Jeremy Huddleston]

 config/udev.c |    2 +-
 mi/misprite.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 089a510dc9511721817df63bf9a968a10b842198
Author: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
Date:   Thu Dec 30 19:19:38 2010 +0200

    mi: Fix the debug message
    
    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit bf48082f30818b96bc623834be3022600371d4fc)

diff --git a/mi/misprite.c b/mi/misprite.c
index 38a6b93..0652887 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -566,7 +566,7 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout,
                     && pCursorInfo->pScreen == pScreen
                     && pCursorInfo->shouldBeUp)
             {
-                SPRITE_DEBUG (("BlockHandler restore\n"));
+                SPRITE_DEBUG (("BlockHandler save"));
                 miSpriteSaveUnderCursor (pDev, pScreen);
             }
         }
commit b22415b0d567fae358b9b7a7067a70c80dd0dd1d
Author: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
Date:   Thu Dec 30 19:19:41 2010 +0200

    udev: Fix removing of the wake up handler
    
    RemoveBlockAndWakeupHandlers requires caller to pass same block data
    parameter as for RegisterBlockAndWakeupHandlers.
    
    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit 3e1455505addc7e52178fa04399aef2a8522c921)

diff --git a/config/udev.c b/config/udev.c
index b7717c9..9445ed6 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -308,7 +308,7 @@ config_udev_fini(void)
     udev = udev_monitor_get_udev(udev_monitor);
 
     RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor));
-    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor);
+    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
     udev_monitor_unref(udev_monitor);
     udev_monitor = NULL;
     udev_unref(udev);