diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:22:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-15 09:15:18 +1000 |
| commit | d33adcdf03c69407d151e732fa0cf9947151eb19 (patch) | |
| tree | b9df4fcf47d7fcbf80215af4568e2b70ce49ccc6 /dix/main.c | |
| parent | 001ce71dc11287dc94cc2fbc5d35677c046e6c04 (diff) | |
dix: move config_init into the DDX.
The only DDX currently using hotplugging is the xfree86 one and it looks
like it'll stay that way for a bit. Move the initialization to the DDX,
since Xephyr, Xnest, and friends don't need HAL or udev notifications.
Add CloseInput (counterpart to InitInput) to be able to clean up the config
initialization from the DDX as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c index da910fe4b..f0235364f 100644 --- a/dix/main.c +++ b/dix/main.c @@ -257,7 +257,6 @@ int main(int argc, char *argv[], char *envp[]) InitCoreDevices(); InitInput(argc, argv); InitAndStartDevices(); - config_init(); dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); @@ -305,7 +304,7 @@ int main(int argc, char *argv[], char *envp[]) FreeAllResources(); #endif - config_fini(); + CloseInput(); memset(WindowTable, 0, sizeof(WindowTable)); CloseDownDevices(); |