diff options
| author | Yang Gu <yang.gu@intel.com> | 2010-09-06 10:19:55 +0800 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-09-09 09:01:28 -0500 |
| commit | 8e03a47995e6ee19dd49ce52bdf8b3fbadfa783d (patch) | |
| tree | 02afb2dea1b2f8a817a9aff241294c39d4b86646 /src/call-barring.c | |
| parent | 41d38d76bcb5344e6097eb491be488454cb549dc (diff) | |
| download | ofono-8e03a47995e6ee19dd49ce52bdf8b3fbadfa783d.tar.bz2 | |
call-barring: Check if ussd is busy
Diffstat (limited to 'src/call-barring.c')
| -rw-r--r-- | src/call-barring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/call-barring.c b/src/call-barring.c index 7607f3f4..a8bb3bd0 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -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, |