dbe: Fold midbe reset into dix
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
25
dbe/midbe.c
25
dbe/midbe.c
@@ -680,30 +680,6 @@ miDbePositionWindow(WindowPtr pWin, int x, int y)
|
||||
|
||||
} /* miDbePositionWindow() */
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* DBE MI Procedure: miDbeResetProc
|
||||
*
|
||||
* Description:
|
||||
*
|
||||
* This function is called from DbeResetProc(), which is called at the end
|
||||
* of every server generation. This function peforms any MI-specific
|
||||
* shutdown tasks.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
miDbeResetProc(ScreenPtr pScreen)
|
||||
{
|
||||
DbeScreenPrivPtr pDbeScreenPriv;
|
||||
|
||||
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
|
||||
|
||||
/* Unwrap wrappers */
|
||||
pScreen->PositionWindow = pDbeScreenPriv->PositionWindow;
|
||||
|
||||
} /* miDbeResetProc() */
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* DBE MI Procedure: miDbeInit
|
||||
@@ -729,7 +705,6 @@ miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
|
||||
pDbeScreenPriv->GetVisualInfo = miDbeGetVisualInfo;
|
||||
pDbeScreenPriv->AllocBackBufferName = miDbeAllocBackBufferName;
|
||||
pDbeScreenPriv->SwapBuffers = miDbeSwapBuffers;
|
||||
pDbeScreenPriv->ResetProc = miDbeResetProc;
|
||||
pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete;
|
||||
|
||||
return TRUE;
|
||||
|
||||
Reference in New Issue
Block a user