xserver: Branch 'master' - 2 commits

[Daniel Stone]

 config/config.c |    6 +++---
 configure.ac    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree a88844eccb0e423e71d4fcb286866a026308babd (from e9a2cc7d9fcc73e16576be2522522cce675dc3f3)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sat Feb 17 20:35:07 2007 +0200

    configure.ac: disable dmx per default
    
    Disable DMX until it gets ported to the new input API.

diff --git a/configure.ac b/configure.ac
index 6841ee4..0a3fe45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -532,7 +532,7 @@ AC_ARG_ENABLE(xfree86-utils,     AS_HELP
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
+AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no])
 AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
 AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
 AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
diff-tree e9a2cc7d9fcc73e16576be2522522cce675dc3f3 (from 81876bc5ddc2f3eda5078fe4bd101917fb32e586)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sat Feb 17 16:17:48 2007 +0200

    config: error message cleanup
    
    Demote failure to connect from ErrorF to DebugF.

diff --git a/config/config.c b/config/config.c
index 76191ab..6c40143 100644
--- a/config/config.c
+++ b/config/config.c
@@ -303,15 +303,15 @@ configSetup(void)
     if (!configData)
         configData = (struct config_data *) xcalloc(sizeof(struct config_data), 1);
     if (!configData) {
-        ErrorF("[dbus] failed to allocate data struct.\n");
+        ErrorF("[dbus] failed to allocate data struct\n");
         return FALSE;
     }
 
     dbus_error_init(&error);
     configData->connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
     if (!configData->connection || dbus_error_is_set(&error)) {
-        ErrorF("[dbus] some kind of error occurred: %s (%s)\n", error.name,
-                error.message);
+        DebugF("[dbus] some kind of error occurred while connecting: %s (%s)\n",
+               error.name, error.message);
         dbus_error_free(&error);
         xfree(configData);
         configData = NULL;