sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ussd: Use __ofono_atom_find

This commit is contained in:
Denis Kenzior 2012-01-18 11:45:49 -06:00
parent 7e426f96cc
commit 688a788da5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ussd.c
View File

@ -543,7 +543,7 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg,
{ {
struct ofono_ussd *ussd = data; struct ofono_ussd *ussd = data;
struct ofono_modem *modem = __ofono_atom_get_modem(ussd->atom); struct ofono_modem *modem = __ofono_atom_get_modem(ussd->atom);
struct ofono_atom *vca; struct ofono_voicecall *vc;
gboolean call_in_progress; gboolean call_in_progress;
const char *str; const char *str;
int dcs = 0x0f; int dcs = 0x0f;
@ -564,11 +564,9 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg,
if (recognized_control_string(ussd, str, msg)) if (recognized_control_string(ussd, str, msg))
return NULL; return NULL;
vca = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_VOICECALL); vc = __ofono_atom_find(OFONO_ATOM_TYPE_VOICECALL, modem);
if (vc)
if (vca) call_in_progress = __ofono_voicecall_is_busy(vc,
call_in_progress =
__ofono_voicecall_is_busy(__ofono_atom_get_data(vca),
OFONO_VOICECALL_INTERACTION_NONE); OFONO_VOICECALL_INTERACTION_NONE);
else else
call_in_progress = FALSE; call_in_progress = FALSE;