From e24d1d1285e7b1ec24c5586a839e6988873225f8 Mon Sep 17 00:00:00 2001 From: Yang Gu Date: Mon, 6 Sep 2010 10:19:55 +0800 Subject: [PATCH] call-forwarding: Check if ussd is busy --- src/call-forwarding.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 4e77144..c8a79b1 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, -- 2.7.4