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

call-barring: Check if ussd is busy

This commit is contained in:
Yang Gu 2010-09-06 10:19:55 +08:00 committed by Denis Kenzior
parent 41d38d76bc
commit 8e03a47995
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/call-barring.c
View File

@ -669,7 +669,7 @@ static DBusMessage *cb_get_properties(DBusConnection *conn, DBusMessage *msg,
{
struct ofono_call_barring *cb = data;
if (cb->pending)
if (cb->pending || __ofono_ussd_is_busy(cb->ussd))
return __ofono_error_busy(msg);
if (!cb->driver->query)
@ -822,7 +822,7 @@ static DBusMessage *cb_set_property(DBusConnection *conn, DBusMessage *msg,
int cls;
int mode;
if (cb->pending)
if (cb->pending || __ofono_ussd_is_busy(cb->ussd))
return __ofono_error_busy(msg);
if (!dbus_message_iter_init(msg, &iter))
@ -894,7 +894,7 @@ static DBusMessage *cb_disable_all(DBusConnection *conn, DBusMessage *msg,
if (!cb->driver->set)
return __ofono_error_not_implemented(msg);
if (cb->pending)
if (cb->pending || __ofono_ussd_is_busy(cb->ussd))
return __ofono_error_busy(msg);
if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &passwd,
@ -941,7 +941,7 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg,
if (!cb->driver->set_passwd)
return __ofono_error_not_implemented(msg);
if (cb->pending)
if (cb->pending || __ofono_ussd_is_busy(cb->ussd))
return __ofono_error_busy(msg);
if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &old_passwd,