[PATCH 1/3] Move config_init() after CreateWellKnownSockets() and InitCoreDevices()

[Peter Hutterer]

On Sun, Dec 06, 2009 at 08:27:06PM +0100, Julien Cristau wrote:
> config_init() can now add devices directly instead of scheduling a
> timer.
> 
> Signed-off-by: Julien Cristau <jcristau at debian.org>
> Tested-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  dix/main.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/dix/main.c b/dix/main.c
> index f96245a..2117a1e 100644
> --- a/dix/main.c
> +++ b/dix/main.c
> @@ -168,7 +168,6 @@ int main(int argc, char *argv[], char *envp[])
>  	InitBlockAndWakeupHandlers();
>  	/* Perform any operating system dependent initializations you'd like */
>  	OsInit();
> -        config_init();
>  	if(serverGeneration == 1)
>  	{
>  	    CreateWellKnownSockets();
> @@ -254,6 +253,7 @@ int main(int argc, char *argv[], char *envp[])
>  	    InitRootWindow(WindowTable[i]);
>  
>          InitCoreDevices();
> +        config_init();
>  	InitInput(argc, argv);
>  	InitAndStartDevices();
>  
> -- 
> 1.6.5

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

This can go in now, I've merged it into my tree.

Cheers,
  Peter