diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2003-02-13 15:29:18 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2003-02-13 15:29:18 +0000 |
| commit | 34e6c6ff31e0bd27bf18c0e3c68b3a1ea9f0448d (patch) | |
| tree | cd360f260c3d9f6cdd5b37f25d940faa12275ac5 /bus | |
| parent | cf5f191bf8fafe1572041f10269f489c4ca76349 (diff) | |
2003-02-13 Anders Carlsson <andersca@codefactory.se>
* bus/driver.c: (bus_driver_send_welcome_message),
(bus_driver_handle_list_services),
(bus_driver_handle_acquire_service),
(bus_driver_handle_service_exists), (bus_driver_handle_message):
Update for API changes in libdbus.
* dbus/dbus-message.c: (dbus_message_new_reply):
* dbus/dbus-message.h:
Remove the name argument. The spec states that replies shouldn't
have a name.
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/driver.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bus/driver.c b/bus/driver.c index 71b780bb..403cfc54 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -201,8 +201,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, - hello_message)); + _DBUS_HANDLE_OOM (welcome = dbus_message_new_reply (hello_message)); _DBUS_HANDLE_OOM (dbus_message_set_sender (welcome, DBUS_SERVICE_DBUS)); @@ -223,7 +222,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, message)); + _DBUS_HANDLE_OOM (reply = dbus_message_new_reply (message)); _DBUS_HANDLE_OOM (services = bus_services_list (&len)); @@ -244,8 +243,8 @@ bus_driver_handle_list_services (DBusConnection *connection, } static void -bus_driver_handle_own_service (DBusConnection *connection, - DBusMessage *message) +bus_driver_handle_acquire_service (DBusConnection *connection, + DBusMessage *message) { DBusMessage *reply; DBusResultCode result; @@ -272,7 +271,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, message))); + _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (message))); /* * Check if the service already has an owner @@ -355,7 +354,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, message))); + _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (message))); _DBUS_HANDLE_OOM (dbus_message_set_sender (reply, DBUS_SERVICE_DBUS)); _DBUS_HANDLE_OOM (dbus_message_append_fields (reply, @@ -391,7 +390,7 @@ bus_driver_handle_message (DBusConnection *connection, else if (strcmp (name, DBUS_MESSAGE_LIST_SERVICES) == 0) bus_driver_handle_list_services (connection, message); else if (strcmp (name, DBUS_MESSAGE_ACQUIRE_SERVICE) == 0) - bus_driver_handle_own_service (connection, message); + bus_driver_handle_acquire_service (connection, message); else if (strcmp (name, DBUS_MESSAGE_SERVICE_EXISTS) == 0) bus_driver_handle_service_exists (connection, message); |