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 --- test/echo-client.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'test/echo-client.c') diff --git a/test/echo-client.c b/test/echo-client.c index de32957f..b6f68fd7 100644 --- a/test/echo-client.c +++ b/test/echo-client.c @@ -7,7 +7,7 @@ main (int argc, char **argv) { DBusConnection *connection; - DBusResultCode result; + DBusError error; DBusMessage *message; if (argc < 2) @@ -15,12 +15,14 @@ main (int argc, fprintf (stderr, "Give the server address as an argument\n"); return 1; } - - connection = dbus_connection_open (argv[1], &result); + + dbus_error_init (&error); + connection = dbus_connection_open (argv[1], &error); if (connection == NULL) { fprintf (stderr, "Failed to open connection to %s: %s\n", - argv[1], dbus_result_to_string (result)); + argv[1], error.message); + dbus_error_free (&error); return 1; } -- cgit