summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-12-19 09:31:43 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-12-19 09:31:43 +0000
commit1eac882c2722eee74b595d8e3af69f3ab10228ae (patch)
tree45cde7097083562ab2cb4f8fcb8a78f294a6a2d2 /audio
parent020112444a9b840e37bfcb5c65dd0b45b147e7fc (diff)
Update method names to resemble more closely the current API draft
Diffstat (limited to 'audio')
-rw-r--r--audio/headset.c8
1 files 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)