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:52 -0500 |
| commit | e24d1d1285e7b1ec24c5586a839e6988873225f8 (patch) | |
| tree | b77380c34a07975088037ce6017016a8bc709f4d | |
| parent | 8e03a47995e6ee19dd49ce52bdf8b3fbadfa783d (diff) | |
| download | ofono-e24d1d1285e7b1ec24c5586a839e6988873225f8.tar.bz2 | |
call-forwarding: Check if ussd is busy
| -rw-r--r-- | src/call-forwarding.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 4e771448..c8a79b14 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -430,7 +430,7 @@ static DBusMessage *cf_get_properties(DBusConnection *conn, DBusMessage *msg, if (!cf->driver->query) return __ofono_error_not_implemented(msg); - if (cf->pending) + if (cf->pending || __ofono_ussd_is_busy(cf->ussd)) return __ofono_error_busy(msg); cf->pending = dbus_message_ref(msg); @@ -586,7 +586,7 @@ static DBusMessage *cf_set_property(DBusConnection *conn, DBusMessage *msg, int cls; int type; - if (cf->pending) + if (cf->pending || __ofono_ussd_is_busy(cf->ussd)) return __ofono_error_busy(msg); if (!dbus_message_iter_init(msg, &iter)) @@ -704,7 +704,7 @@ static DBusMessage *cf_disable_all(DBusConnection *conn, DBusMessage *msg, if (!cf->driver->erasure) return __ofono_error_not_implemented(msg); - if (cf->pending) + if (cf->pending || __ofono_ussd_is_busy(cf->ussd)) return __ofono_error_busy(msg); if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &strtype, |