xserver: Branch 'master'

[Eric Anholt]

 config/config.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 3e7e0e35094d09e0e764818ed125314be75be01a (from 4e6e4baead6c565363abbcd9e06cc685be121596)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov 7 14:13:23 2006 -0800

    Report the error before freeing the error strings.

diff --git a/config/config.c b/config/config.c
index 5b0d90d..d597222 100644
--- a/config/config.c
+++ b/config/config.c
@@ -258,9 +258,9 @@ configInitialise()
     dbus_error_init(&error);
     bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
     if (!bus || dbus_error_is_set(&error)) {
-        dbus_error_free(&error);
         FatalError("[dbus] some kind of error occurred: %s (%s)\n", error.name,
                    error.message);
+        dbus_error_free(&error);
         return;
     }