diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-15 08:14:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-15 08:14:29 +0000 |
| commit | b40e949511ca8c00cd7d13c622b5247145d44ab3 (patch) | |
| tree | ce21480d852a4748ad12a56f3579acf1cbc09f41 /xorg-server/dix | |
| parent | fb89fb367b0defb8016ac97af590a6f5873c217f (diff) | |
| parent | 6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e (diff) | |
| download | vcxsrv-b40e949511ca8c00cd7d13c622b5247145d44ab3.tar.gz vcxsrv-b40e949511ca8c00cd7d13c622b5247145d44ab3.tar.bz2 vcxsrv-b40e949511ca8c00cd7d13c622b5247145d44ab3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index 124de5efa..54cd8a919 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -301,7 +301,6 @@ int main(int argc, char *argv[], char *envp[]) InitCoreDevices();
InitInput(argc, argv);
InitAndStartDevices();
- config_init();
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
@@ -349,11 +348,10 @@ int main(int argc, char *argv[], char *envp[]) FreeAllResources();
#endif
- config_fini();
+ CloseInput();
memset(WindowTable, 0, sizeof(WindowTable));
CloseDownDevices();
- InputDevicesClosed();
CloseDownEvents();
for (i = screenInfo.numScreens - 1; i >= 0; i--)
|