diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-02-01 00:08:32 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-02-01 00:08:32 +0000 |
| commit | ca84a292179f520df8e2c44a02d285ded95803ff (patch) | |
| tree | bbb4e81703260e950d5ede9e9949643a415bf1c7 /bus | |
| parent | 0ff552a2c5c542a1be9a1c73597c298e6ece358f (diff) | |
2003-01-31 Havoc Pennington <hp@pobox.com>
* doc/dbus-specification.sgml: work on the specification
* dbus/dbus-message.c (_dbus_message_loader_return_buffer): check
the protocol version of the message.
* dbus/dbus-protocol.h: drop special _REPLY names, the spec
no longer specifies that.
(DBUS_SERVICE_REPLY_SERVICE_EXISTS): fix flags (1/2/4/8 not
1/2/3/4)
* dbus/dbus-marshal.c (_dbus_marshal_get_arg_end_pos): add missing
"break" for DBUS_TYPE_NIL, remove @todo
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bus/driver.c b/bus/driver.c index c8631ffb..ea13a9e6 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -221,7 +221,7 @@ bus_driver_send_welcome_message (DBusConnection *connection, name = bus_connection_get_name (connection); _dbus_assert (name != NULL); - _DBUS_HANDLE_OOM (welcome = dbus_message_new_reply (DBUS_MESSAGE_HELLO_REPLY, + _DBUS_HANDLE_OOM (welcome = dbus_message_new_reply (DBUS_MESSAGE_HELLO, hello_message)); _DBUS_HANDLE_OOM (dbus_message_set_sender (welcome, DBUS_SERVICE_DBUS)); @@ -243,7 +243,7 @@ bus_driver_handle_list_services (DBusConnection *connection, int len, i; char **services; - _DBUS_HANDLE_OOM (reply = dbus_message_new_reply (DBUS_MESSAGE_LIST_SERVICES_REPLY, message)); + _DBUS_HANDLE_OOM (reply = dbus_message_new_reply (DBUS_MESSAGE_LIST_SERVICES, message)); _DBUS_HANDLE_OOM (services = bus_services_list (&len)); @@ -292,7 +292,7 @@ bus_driver_handle_own_service (DBusConnection *connection, _dbus_string_init_const (&service_name, name); service = bus_service_lookup (&service_name, TRUE); - _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (DBUS_MESSAGE_ACQUIRE_SERVICE_REPLY, message))); + _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (DBUS_MESSAGE_ACQUIRE_SERVICE, message))); /* * Check if the service already has an owner @@ -372,7 +372,7 @@ bus_driver_handle_service_exists (DBusConnection *connection, _dbus_string_init_const (&service_name, name); service = bus_service_lookup (&service_name, FALSE); - _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (DBUS_MESSAGE_ACQUIRE_SERVICE_REPLY, message))); + _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (DBUS_MESSAGE_ACQUIRE_SERVICE, message))); _DBUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); _DBUS_HANDLE_OOM (dbus_message_append_fields (message, |