diff options
| author | Yang Gu <yang.gu@intel.com> | 2010-09-21 18:21:17 +0800 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-09-26 19:50:50 -0500 |
| commit | a9aac83e33d88aa95da4a300148fbee6fdcfe8a6 (patch) | |
| tree | b010790bae2f049d36d902d82dc37b29150055b0 /src/call-forwarding.c | |
| parent | 6235b26e9383cb39fb3fe61a4533d42c9057d882 (diff) | |
| download | ofono-a9aac83e33d88aa95da4a300148fbee6fdcfe8a6.tar.bz2 | |
ss: Use function to judge if it's busy
Diffstat (limited to 'src/call-forwarding.c')
| -rw-r--r-- | src/call-forwarding.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/call-forwarding.c b/src/call-forwarding.c index f99e4a58..928cda10 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -432,7 +432,8 @@ static DBusMessage *cf_get_properties(DBusConnection *conn, DBusMessage *msg, if (!cf->driver->query) return __ofono_error_not_implemented(msg); - if (cf->pending || __ofono_ussd_is_busy(cf->ussd)) + if (__ofono_call_forwarding_is_busy(cf) || + __ofono_ussd_is_busy(cf->ussd)) return __ofono_error_busy(msg); cf->pending = dbus_message_ref(msg); @@ -589,7 +590,8 @@ static DBusMessage *cf_set_property(DBusConnection *conn, DBusMessage *msg, int cls; int type; - if (cf->pending || __ofono_ussd_is_busy(cf->ussd)) + if (__ofono_call_forwarding_is_busy(cf) || + __ofono_ussd_is_busy(cf->ussd)) return __ofono_error_busy(msg); if (!dbus_message_iter_init(msg, &iter)) @@ -707,7 +709,8 @@ static DBusMessage *cf_disable_all(DBusConnection *conn, DBusMessage *msg, if (!cf->driver->erasure) return __ofono_error_not_implemented(msg); - if (cf->pending || __ofono_ussd_is_busy(cf->ussd)) + if (__ofono_call_forwarding_is_busy(cf) || + __ofono_ussd_is_busy(cf->ussd)) return __ofono_error_busy(msg); if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &strtype, @@ -898,7 +901,7 @@ static gboolean cf_ss_control(int type, const char *sc, if (!cf) return FALSE; - if (cf->pending) { + if (__ofono_call_forwarding_is_busy(cf)) { reply = __ofono_error_busy(msg); g_dbus_send_message(conn, reply); |