diff options
author | Adam Jackson <ajax@redhat.com> | 2012-10-16 14:56:21 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 13:28:24 -0400 |
commit | 1489637d567b0034a916f88079b5f360e7fce99c (patch) | |
tree | 3994cfb189ef9a27a6d50ff9978707f9b1088fdd /dbe/dbe.c | |
parent | 44d770750069486a8452fb2384f9b85745268e61 (diff) |
dbe: Fold midbe reset into dix
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dbe/dbe.c')
-rw-r--r-- | dbe/dbe.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -91,7 +91,6 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens) pDbeScreenPriv->AllocBackBufferName = NULL; pDbeScreenPriv->SwapBuffers = NULL; pDbeScreenPriv->WinPrivDelete = NULL; - pDbeScreenPriv->ResetProc = NULL; (*nStubbedScreens)++; @@ -1255,10 +1254,7 @@ DbeResetProc(ExtensionEntry * extEntry) if (pDbeScreenPriv) { /* Unwrap DestroyWindow, which was wrapped in DbeExtensionInit(). */ pScreen->DestroyWindow = pDbeScreenPriv->DestroyWindow; - - if (pDbeScreenPriv->ResetProc) - (*pDbeScreenPriv->ResetProc) (pScreen); - + pScreen->PositionWindow = pDbeScreenPriv->PositionWindow; free(pDbeScreenPriv); } } |