From 901c4ebf620579c5bb951a8c003430d967ecf2ff Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 11 Jan 2010 00:31:27 +0000
Subject: main: move config_init() after InitInput()

With the udev backend, config_init() calls NewInputDeviceRequest(),
which enables devices.  They can then start sending events, even though
the event queue is only initialized later in InitInput().  Oops.

Debian bug#564256 <http://bugs.debian.org/564256>

Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Sedat Dilek <sedat.dilek@googlemail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 dix/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/main.c b/dix/main.c
index d4db90c75..da910fe4b 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -255,9 +255,9 @@ int main(int argc, char *argv[], char *envp[])
 	    InitRootWindow(WindowTable[i]);
 
         InitCoreDevices();
-        config_init();
 	InitInput(argc, argv);
 	InitAndStartDevices();
+	config_init();
 
 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
-- 
cgit v1.2.3