diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-19 10:05:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 15:19:49 -0400 |
| commit | 02a95311568e24e1055ea52c7df8cb7aa3f38ad0 (patch) | |
| tree | add5acaf2c60969aa9a9e49dee22c4682d3a3423 /dix/main.c | |
| parent | 93cd53860c3aca182a0a02543c41b5d71d65926b (diff) | |
add basic D-BUS configuration mechanism
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dix/main.c b/dix/main.c index 9d66a4fa8..5f539895e 100644 --- a/dix/main.c +++ b/dix/main.c @@ -101,6 +101,7 @@ Equipment Corporation. #include <X11/fonts/font.h> #include "opaque.h" #include "servermd.h" +#include "config.h" #include "site.h" #include "dixfont.h" #include "extnsionst.h" @@ -311,6 +312,7 @@ main(int argc, char *argv[], char *envp[]) DPMSPowerLevel = 0; #endif InitBlockAndWakeupHandlers(); + configInitialise(); /* Perform any operating system dependent initializations you'd like */ OsInit(); if(serverGeneration == 1) @@ -463,6 +465,7 @@ main(int argc, char *argv[], char *envp[]) FreeAllResources(); #endif + configFini(); CloseDownDevices(); for (i = screenInfo.numScreens - 1; i >= 0; i--) { |