From 8873c90f99303f9cc308f15f8d03e637911f5b9e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 18 Jan 2005 20:42:15 +0000 Subject: 2005-01-18 Havoc Pennington * Throughout, grand renaming to strip out the use of "service", just say "name" instead (or "bus name" when ambiguous). Did not change the internal code of the message bus itself, only the programmer-facing API and messages. * doc/dbus-specification.xml: further update the message bus section * bus/config-parser.c (all_are_equiv): fix bug using freed string in error case --- dbus/dbus-marshal-header.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dbus/dbus-marshal-header.c') diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index 8c5120cf..8346c3af 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -505,7 +505,7 @@ _dbus_header_copy (const DBusHeader *header, * * @param header the header * @param message_type the message type - * @param destination service field or #NULL + * @param destination destination field or #NULL * @param path path field or #NULL * @param interface interface field or #NULL * @param member member field or #NULL @@ -833,7 +833,7 @@ load_and_validate_field (DBusHeader *header, switch (field) { case DBUS_HEADER_FIELD_DESTINATION: - string_validation_func = _dbus_validate_service; + string_validation_func = _dbus_validate_bus_name; bad_string_code = DBUS_INVALID_BAD_DESTINATION; break; case DBUS_HEADER_FIELD_INTERFACE: @@ -861,7 +861,7 @@ load_and_validate_field (DBusHeader *header, break; case DBUS_HEADER_FIELD_SENDER: - string_validation_func = _dbus_validate_service; + string_validation_func = _dbus_validate_bus_name; bad_string_code = DBUS_INVALID_BAD_SENDER; break; -- cgit