From d296dbce73166b8e796dfeb5e6c560ff6514d0d6 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sat, 24 Nov 2012 12:36:57 +0200 Subject: [PATCH] audio: Remove deprecated Control.IsConnected method --- doc/control-api.txt | 6 +----- profiles/audio/control.c | 24 ------------------------ 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/doc/control-api.txt b/doc/control-api.txt index 85b644262..c3389b2f7 100644 --- a/doc/control-api.txt +++ b/doc/control-api.txt @@ -12,11 +12,7 @@ Service org.bluez Interface org.bluez.Control Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX -Methods boolean IsConnected() {deprecated} - - Returns True if connected, otherwise FALSE. - - void Connect() +Methods void Connect() Connect to remote device. diff --git a/profiles/audio/control.c b/profiles/audio/control.c index b2bfb0ae3..0106f2a0a 100644 --- a/profiles/audio/control.c +++ b/profiles/audio/control.c @@ -132,27 +132,6 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state, } } -static DBusMessage *control_is_connected(DBusConnection *conn, - DBusMessage *msg, - void *data) -{ - struct audio_device *device = data; - struct control *control = device->control; - DBusMessage *reply; - dbus_bool_t connected; - - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - - connected = (control->session != NULL); - - dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &connected, - DBUS_TYPE_INVALID); - - return reply; -} - int control_connect(struct audio_device *dev, audio_device_cb cb, void *data) { struct control *control = dev->control; @@ -322,9 +301,6 @@ static gboolean control_property_get_connected( } static const GDBusMethodTable control_methods[] = { - { GDBUS_DEPRECATED_METHOD("IsConnected", - NULL, GDBUS_ARGS({ "connected", "b" }), - control_is_connected) }, { GDBUS_ASYNC_METHOD("Connect", NULL, NULL, connect_control) }, { GDBUS_METHOD("Disconnect", NULL, NULL, disconnect_control) }, { GDBUS_METHOD("Play", NULL, NULL, control_play) }, -- 2.47.3