summaryrefslogtreecommitdiffstats
path: root/glib/test-thread-server.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-25 04:37:08 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-25 04:37:08 +0000
commitce4fd314c6be9bfee16a172d5ca34e5097d309fc (patch)
tree744b8524f183a0fbb009d917029c9a129b34da9e /glib/test-thread-server.c
parent44fff656885ac32e319feb98fd0d06680d602977 (diff)
2003-03-24 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'glib/test-thread-server.c')
-rw-r--r--glib/test-thread-server.c8
1 files changed, 5 insertions, 3 deletions
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;
}