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 /dbus | |
| 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 'dbus')
| -rw-r--r-- | dbus/dbus-message.c | 9 | ||||
| -rw-r--r-- | dbus/dbus-message.h | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 344aa478..e641b59f 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -787,15 +787,16 @@ dbus_message_new (const char *service, * @see dbus_message_new(), dbus_message_unref() */ DBusMessage* -dbus_message_new_reply (const char *name, - DBusMessage *original_message) +dbus_message_new_reply (DBusMessage *original_message) { DBusMessage *message; - const char *sender; + const char *sender, *name; sender = get_string_field (original_message, FIELD_SENDER, NULL); - + name = get_string_field (original_message, + FIELD_NAME, NULL); + _dbus_assert (sender != NULL); message = dbus_message_new (sender, name); diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h index 3fed70e6..753cc381 100644 --- a/dbus/dbus-message.h +++ b/dbus/dbus-message.h @@ -38,8 +38,7 @@ typedef struct DBusMessageIter DBusMessageIter; DBusMessage* dbus_message_new (const char *service, const char *name); -DBusMessage* dbus_message_new_reply (const char *name, - DBusMessage *original_message); +DBusMessage* dbus_message_new_reply (DBusMessage *original_message); DBusMessage *dbus_message_new_from_message (const DBusMessage *message); void dbus_message_ref (DBusMessage *message); |