From 688a788da568fe7c6665a8a5bac4296ce3cd004e Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 18 Jan 2012 11:45:49 -0600 Subject: [PATCH] ussd: Use __ofono_atom_find --- src/ussd.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ussd.c b/src/ussd.c index e3ab20be..d2d36214 100644 --- a/src/ussd.c +++ b/src/ussd.c @@ -543,7 +543,7 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, { struct ofono_ussd *ussd = data; struct ofono_modem *modem = __ofono_atom_get_modem(ussd->atom); - struct ofono_atom *vca; + struct ofono_voicecall *vc; gboolean call_in_progress; const char *str; int dcs = 0x0f; @@ -564,11 +564,9 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, if (recognized_control_string(ussd, str, msg)) return NULL; - vca = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_VOICECALL); - - if (vca) - call_in_progress = - __ofono_voicecall_is_busy(__ofono_atom_get_data(vca), + vc = __ofono_atom_find(OFONO_ATOM_TYPE_VOICECALL, modem); + if (vc) + call_in_progress = __ofono_voicecall_is_busy(vc, OFONO_VOICECALL_INTERACTION_NONE); else call_in_progress = FALSE;