diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2012-08-05 23:31:05 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2012-08-05 23:34:16 -0500 |
| commit | 3d57bf37d06f1b41944f6e14cdc1ab8e3b6fedb9 (patch) | |
| tree | e6b2ab820b0573f9109425bcfce7cc08a5cb54de /src/voicecall.c | |
| parent | 5863c56c3aca30528304875117032a94308578f0 (diff) | |
| download | ofono-3d57bf37d06f1b41944f6e14cdc1ab8e3b6fedb9.tar.bz2 | |
voicecall: Implement ReleaseAndSwap
Diffstat (limited to 'src/voicecall.c')
| -rw-r--r-- | src/voicecall.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/voicecall.c b/src/voicecall.c index b4ba23f7..12e5d4e7 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1699,6 +1699,27 @@ static DBusMessage *manager_release_and_answer(DBusConnection *conn, return NULL; } +static DBusMessage *manager_release_and_swap(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct ofono_voicecall *vc = data; + + if (vc->pending || vc->dial_req || vc->pending_em) + return __ofono_error_busy(msg); + + if (voicecalls_have_waiting(vc)) + return __ofono_error_failed(msg); + + if (vc->driver->release_all_active == NULL) + return __ofono_error_not_implemented(msg); + + vc->pending = dbus_message_ref(msg); + + vc->driver->release_all_active(vc, generic_callback, vc); + + return NULL; +} + static DBusMessage *manager_hold_and_answer(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -2131,6 +2152,8 @@ static const GDBusMethodTable manager_methods[] = { { GDBUS_ASYNC_METHOD("SwapCalls", NULL, NULL, manager_swap_calls) }, { GDBUS_ASYNC_METHOD("ReleaseAndAnswer", NULL, NULL, manager_release_and_answer) }, + { GDBUS_ASYNC_METHOD("ReleaseAndSwap", NULL, NULL, + manager_release_and_swap) }, { GDBUS_ASYNC_METHOD("HoldAndAnswer", NULL, NULL, manager_hold_and_answer) }, { GDBUS_ASYNC_METHOD("HangupAll", NULL, NULL, |