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 --- test/glib/test-profile.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'test/glib/test-profile.c') diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c index 77ce4369..6b4e9058 100644 --- a/test/glib/test-profile.c +++ b/test/glib/test-profile.c @@ -423,19 +423,19 @@ with_bus_server_filter (DBusConnection *connection, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) && dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, - "ServiceOwnerChanged")) + "NameOwnerChanged")) { - const char *service_name, *old_owner, *new_owner; + const char *name, *old_owner, *new_owner; DBusError error; - service_name = NULL; + name = NULL; old_owner = NULL; new_owner = NULL; dbus_error_init (&error); if (!dbus_message_get_args (message, &error, - DBUS_TYPE_STRING, &service_name, + DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old_owner, DBUS_TYPE_STRING, &new_owner, DBUS_TYPE_INVALID)) @@ -445,12 +445,12 @@ with_bus_server_filter (DBusConnection *connection, } if (g_hash_table_lookup (server->client_names, - service_name) && + name) && *old_owner != '\0' && *new_owner == '\0') { g_hash_table_remove (server->client_names, - service_name); + name); server->sd->n_clients -= 1; if (server->sd->n_clients == 0) g_main_loop_quit (server->sd->loop); @@ -525,13 +525,13 @@ with_bus_init_server (ServerData *sd) connection = dbus_g_connection_get_connection (gconnection); - dbus_bus_acquire_service (connection, - ECHO_SERVICE, - 0, NULL); /* ignore errors because we suck */ + dbus_bus_request_name (connection, + ECHO_SERVICE, + 0, NULL); /* ignore errors because we suck */ rule = g_strdup_printf ("type='signal',sender='%s',member='%s'", DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - "ServiceOwnerChanged"); + "NameOwnerChanged"); /* ignore errors because we suck */ dbus_bus_add_match (connection, rule, NULL); -- cgit