From ce4fd314c6be9bfee16a172d5ca34e5097d309fc Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 25 Mar 2003 04:37:08 +0000 Subject: 2003-03-24 Havoc Pennington * dbus/dbus-sysdeps.c (_dbus_set_fd_nonblocking): move to this file * dbus/dbus-errors.c (dbus_set_error, dbus_set_error_const): allow NULL argument for "message" if the error is a well-known one, fill in a generic message in this case. * dbus/dbus-errors.h (DBusResultCode): Kill DBusResultCode in favor of DBusError * bus/test.c (bus_test_flush_bus): add * bus/policy.c (bus_policy_test): test code stub --- glib/test-thread-server.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'glib/test-thread-server.c') diff --git a/glib/test-thread-server.c b/glib/test-thread-server.c index 066c393b..06f597df 100644 --- a/glib/test-thread-server.c +++ b/glib/test-thread-server.c @@ -202,7 +202,7 @@ main (int argc, char *argv[]) { GMainLoop *loop; DBusServer *server; - DBusResultCode result; + DBusError error; g_thread_init (NULL); dbus_gthread_init (); @@ -213,11 +213,13 @@ main (int argc, char *argv[]) return 1; } - server = dbus_server_listen (argv[1], &result); + dbus_error_init (&error); + server = dbus_server_listen (argv[1], &error); if (server == NULL) { fprintf (stderr, "Failed to start server on %s: %s\n", - argv[1], dbus_result_to_string (result)); + argv[1], error.message); + dbus_error_free (&error); return 1; } -- cgit