diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2003-02-13 21:21:42 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2003-02-13 21:21:42 +0000 |
| commit | aa4b4ef5955606659557a40a2220090ee9c108d4 (patch) | |
| tree | 86038fbfeedd65f137fa29ac0f2a04bc8a8cb9de /dbus/dbus-bus.c | |
| parent | a7c05492537b149f67760ecb1958350900843173 (diff) | |
2003-02-13 Anders Carlsson <andersca@codefactory.se>
* bus/driver.c: (bus_driver_send_service_deleted),
(bus_driver_send_service_created), (bus_driver_send_service_lost),
(bus_driver_send_service_acquired), (bus_driver_handle_hello),
(bus_driver_send_welcome_message),
(bus_driver_handle_list_services),
(bus_driver_handle_acquire_service),
(bus_driver_handle_service_exists):
* dbus/dbus-bus.c: (dbus_bus_register_client),
(dbus_bus_acquire_service), (dbus_bus_service_exists):
* dbus/dbus-errors.c: (dbus_result_to_string):
* dbus/dbus-errors.h:
* dbus/dbus-message.c: (dbus_message_append_args),
(dbus_message_append_args_valist), (dbus_message_get_args),
(dbus_message_get_args_valist), (dbus_message_get_args_iter),
(dbus_message_iter_get_arg_type), (dbus_message_iter_get_string),
(dbus_message_iter_get_byte_array),
(dbus_message_iter_get_string_array), (message_iter_test),
(check_message_handling), (_dbus_message_test):
* dbus/dbus-message.h:
* test/bus-test.c: (main):
Change fields to arguments in messages, so that they won't be
confused with header fields.
* glib/test-dbus-glib.c: (main):
Remove append_fields from hello message.
Diffstat (limited to 'dbus/dbus-bus.c')
| -rw-r--r-- | dbus/dbus-bus.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index a9468ed6..776c78ae 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -64,9 +64,9 @@ dbus_bus_register_client (DBusConnection *connection, if (!reply) return NULL; - code = dbus_message_get_fields (reply, - DBUS_TYPE_STRING, &name, - 0); + code = dbus_message_get_args (reply, + DBUS_TYPE_STRING, &name, + 0); if (code != DBUS_RESULT_SUCCESS) { dbus_set_result (result, code); @@ -106,10 +106,10 @@ dbus_bus_acquire_service (DBusConnection *connection, return -1; } - if (!dbus_message_append_fields (message, - DBUS_TYPE_STRING, service_name, - DBUS_TYPE_UINT32, flags, - 0)) + if (!dbus_message_append_args (message, + DBUS_TYPE_STRING, service_name, + DBUS_TYPE_UINT32, flags, + 0)) { dbus_message_unref (message); dbus_set_result (result, DBUS_RESULT_NO_MEMORY); @@ -122,9 +122,9 @@ dbus_bus_acquire_service (DBusConnection *connection, if (!reply) return -1; - code = dbus_message_get_fields (reply, - DBUS_TYPE_UINT32, &service_result, - 0); + code = dbus_message_get_args (reply, + DBUS_TYPE_UINT32, &service_result, + 0); if (code != DBUS_RESULT_SUCCESS) { dbus_set_result (result, code); @@ -161,9 +161,9 @@ dbus_bus_service_exists (DBusConnection *connection, return FALSE; } - if (!dbus_message_append_fields (message, - DBUS_TYPE_STRING, service_name, - 0)) + if (!dbus_message_append_args (message, + DBUS_TYPE_STRING, service_name, + 0)) { dbus_message_unref (message); dbus_set_result (result, DBUS_RESULT_NO_MEMORY); @@ -176,9 +176,9 @@ dbus_bus_service_exists (DBusConnection *connection, if (!reply) return FALSE; - code = dbus_message_get_fields (reply, - DBUS_TYPE_UINT32, &exists, - 0); + code = dbus_message_get_args (reply, + DBUS_TYPE_UINT32, &exists, + 0); if (code != DBUS_RESULT_SUCCESS) { dbus_set_result (result, code); |