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-barring.c | |
| parent | 6235b26e9383cb39fb3fe61a4533d42c9057d882 (diff) | |
| download | ofono-a9aac83e33d88aa95da4a300148fbee6fdcfe8a6.tar.bz2 | |
ss: Use function to judge if it's busy
Diffstat (limited to 'src/call-barring.c')
| -rw-r--r-- | src/call-barring.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/call-barring.c b/src/call-barring.c index 4bca906f..f89602ee 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -372,7 +372,7 @@ static gboolean cb_ss_control(int type, const char *sc, void *operation = NULL; int i; - if (cb->pending) { + if (__ofono_call_barring_is_busy(cb)) { reply = __ofono_error_busy(msg); g_dbus_send_message(conn, reply); @@ -505,7 +505,7 @@ static gboolean cb_ss_passwd(const char *sc, DBusMessage *reply; const char *fac; - if (cb->pending) { + if (__ofono_call_barring_is_busy(cb)) { reply = __ofono_error_busy(msg); g_dbus_send_message(conn, reply); @@ -675,7 +675,7 @@ static DBusMessage *cb_get_properties(DBusConnection *conn, DBusMessage *msg, { struct ofono_call_barring *cb = data; - if (cb->pending || __ofono_ussd_is_busy(cb->ussd)) + if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) return __ofono_error_busy(msg); if (!cb->driver->query) @@ -830,7 +830,7 @@ static DBusMessage *cb_set_property(DBusConnection *conn, DBusMessage *msg, int cls; int mode; - if (cb->pending || __ofono_ussd_is_busy(cb->ussd)) + if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) return __ofono_error_busy(msg); if (!dbus_message_iter_init(msg, &iter)) @@ -902,7 +902,7 @@ static DBusMessage *cb_disable_all(DBusConnection *conn, DBusMessage *msg, if (!cb->driver->set) return __ofono_error_not_implemented(msg); - if (cb->pending || __ofono_ussd_is_busy(cb->ussd)) + if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) return __ofono_error_busy(msg); if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &passwd, @@ -949,7 +949,7 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg, if (!cb->driver->set_passwd) return __ofono_error_not_implemented(msg); - if (cb->pending || __ofono_ussd_is_busy(cb->ussd)) + if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) return __ofono_error_busy(msg); if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &old_passwd, |