From 1eac882c2722eee74b595d8e3af69f3ab10228ae Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 19 Dec 2006 09:31:43 +0000 Subject: Update method names to resemble more closely the current API draft --- audio/headset.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/audio/headset.c b/audio/headset.c index 8098e8ed..2bda011d 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -348,9 +348,7 @@ static gboolean rfcomm_io_cb(GIOChannel *chan, GIOCondition cond, gpointer user_ if (!hs->data_length) hs->data_start = 0; - } - } if (hs->ring_timer) { @@ -1092,16 +1090,16 @@ static DBusHandlerResult hs_message(DBusConnection *conn, if (strcmp(interface, "org.bluez.Headset") != 0) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (strcmp(member, "Connect") == 0) + if (strcmp(member, "ConnectHeadset") == 0) return hs_connect(conn, msg, NULL); if (strcmp(member, "Disconnect") == 0) return hs_disconnect(conn, msg); - if (strcmp(member, "Ring") == 0) + if (strcmp(member, "IndicateCall") == 0) return hs_ring(conn, msg); - if (strcmp(member, "CancelRinging") == 0) + if (strcmp(member, "CancelCall") == 0) return hs_cancel_ringing(conn, msg); if (strcmp(member, "Play") == 0) -- cgit