From 35a9ae3336e364b07bcc65ea6b0acd839f7d39ac Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Sat, 24 Nov 2012 12:39:53 +0200
Subject: [PATCH] audio: Remove deprecated Connected/Disconnected signals

---
 doc/control-api.txt      | 10 ----------
 profiles/audio/control.c | 13 +------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/doc/control-api.txt b/doc/control-api.txt
index c3389b2f7..0d2551229 100644
--- a/doc/control-api.txt
+++ b/doc/control-api.txt
@@ -52,16 +52,6 @@ Methods		void Connect()
 
 			Adjust remote volume one step down
 
-Signals		Connected() {deprecated}
-
-			Sent when a successful AVRCP connection has been made
-			to the remote device.
-
-		Disconnected() {deprecated}
-
-			Sent when the AVRCP connection to the remote device
-			has been disconnected.
-
 Properties
 
 		boolean Connected [readonly]
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 0106f2a0a..29cf3bbef 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -102,8 +102,6 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state,
 		if (old_state != AVCTP_STATE_CONNECTED)
 			break;
 
-		g_dbus_emit_signal(conn, path, AUDIO_CONTROL_INTERFACE,
-					"Disconnected", DBUS_TYPE_INVALID);
 		g_dbus_emit_property_changed(conn, path,
 					AUDIO_CONTROL_INTERFACE, "Connected");
 
@@ -121,9 +119,6 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state,
 			control->connect = NULL;
 		}
 
-		g_dbus_emit_signal(conn, path,
-				AUDIO_CONTROL_INTERFACE, "Connected",
-				DBUS_TYPE_INVALID);
 		g_dbus_emit_property_changed(conn, path,
 					AUDIO_CONTROL_INTERFACE, "Connected");
 		break;
@@ -313,12 +308,6 @@ static const GDBusMethodTable control_methods[] = {
 	{ }
 };
 
-static const GDBusSignalTable control_signals[] = {
-	{ GDBUS_DEPRECATED_SIGNAL("Connected", NULL) },
-	{ GDBUS_DEPRECATED_SIGNAL("Disconnected", NULL) },
-	{ }
-};
-
 static const GDBusPropertyTable control_properties[] = {
 	{ "Connected", "b", control_property_get_connected },
 	{ }
@@ -362,7 +351,7 @@ struct control *control_init(struct audio_device *dev, GSList *uuids)
 	if (!g_dbus_register_interface(btd_get_dbus_connection(),
 					device_get_path(dev->btd_dev),
 					AUDIO_CONTROL_INTERFACE,
-					control_methods, control_signals,
+					control_methods, NULL,
 					control_properties, dev,
 					path_unregister))
 		return NULL;
-- 
2.47.3