diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 19:21:51 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 19:21:51 +0000 |
| commit | 9ec58817713065b28e0f8d734fe10181ef5b170e (patch) | |
| tree | 9bfc9b4f5a9c3e95cd5f2b82df97ffa02f8a2372 | |
| parent | e74b4c1bd9c05ff994ada9166cd6b5c6efb0cc6a (diff) | |
Remove GetConnectionName method
| -rw-r--r-- | hcid/dbus-api.txt | 13 | ||||
| -rw-r--r-- | hcid/dbus-service.c | 22 |
2 files changed, 4 insertions, 31 deletions
diff --git a/hcid/dbus-api.txt b/hcid/dbus-api.txt index 8a1595f4..bac035b4 100644 --- a/hcid/dbus-api.txt +++ b/hcid/dbus-api.txt @@ -1114,12 +1114,7 @@ Service org.bluez Interface org.bluez.Service Object path path from org.bluez.Manager.ListServices() -Methods string GetConnectionName() - - This method returns the name of the connection to - the service agent. - - string GetName() +Methods string GetName() This method returns the service name. @@ -1129,12 +1124,12 @@ Methods string GetConnectionName() void Start() - This method tells the service agent to actually - start the service. + This method tells the system to start the + service. void Stop() - This method tells the service agent to stop the + This method tells the system to stop the service. boolean IsRunning() diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index 2c449c6e..6cc0630b 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -168,27 +168,6 @@ static void service_exit(const char *name, struct service *service) service->bus_name = NULL; } -static DBusHandlerResult get_connection_name(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - struct service *service = data; - DBusMessage *reply; - const char *bus_name; - - reply = dbus_message_new_method_return(msg); - if (!reply) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - - if (service->bus_name) - bus_name = service->bus_name; - - dbus_message_append_args(reply, - DBUS_TYPE_STRING, &bus_name, - DBUS_TYPE_INVALID); - - return send_message_and_unref(conn, reply); -} - static DBusHandlerResult get_name(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -617,7 +596,6 @@ static DBusHandlerResult remove_trust(DBusConnection *conn, static struct service_data services_methods[] = { { "GetName", get_name }, { "GetDescription", get_description }, - { "GetConnectionName", get_connection_name }, { "Start", start }, { "Stop", stop }, { "IsRunning", is_running }, |