From 3e5a5abb0de102f626a92f2a03d19d1c2acf0300 Mon Sep 17 00:00:00 2001 From: Tomas Frydrych Date: Wed, 18 May 2011 20:47:52 +0100 Subject: [PATCH 1/2] Xephyr: added dummy ephyrDeviceCursorCleanup() to avoid crashing The DeviceCursorCleanup in miPointerSpriteFuncRec can no longer be NULL it seems. Signed-off-by: Tomas Frydrych --- hw/kdrive/ephyr/ephyrinit.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 27cab3b..2deb7b8 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -358,13 +358,18 @@ ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) return TRUE; } +static void +ephyrDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) +{ +} + miPointerSpriteFuncRec EphyrPointerSpriteFuncs = { ephyrRealizeCursor, ephyrUnrealizeCursor, ephyrSetCursor, ephyrMoveCursor, ephyrDeviceCursorInitialize, - NULL + ephyrDeviceCursorCleanup }; -- 1.7.5.1