diff options
author | Denis Kenzior <denkenz@gmail.com> | 2012-01-18 11:45:49 -0600 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2012-01-18 12:21:36 -0600 |
commit | 688a788da568fe7c6665a8a5bac4296ce3cd004e (patch) | |
tree | 1644467e3c050cb3a49c7ab975611df260e3069c /src/ussd.c | |
parent | 7e426f96cc3324b1fd0bf28dd1c73e4cd9e1b855 (diff) | |
download | ofono-688a788da568fe7c6665a8a5bac4296ce3cd004e.tar.bz2 |
ussd: Use __ofono_atom_find
Diffstat (limited to 'src/ussd.c')
-rw-r--r-- | src/ussd.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -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; |