diff options
| -rw-r--r-- | src/stkagent.c | 9 | ||||
| -rw-r--r-- | src/stkagent.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/stkagent.c b/src/stkagent.c index 931e6697..22ff7c6b 100644 --- a/src/stkagent.c +++ b/src/stkagent.c @@ -106,11 +106,6 @@ static void stk_agent_request_end(struct stk_agent *agent) agent->user_cb = NULL; } -ofono_bool_t stk_agent_busy(struct stk_agent *agent) -{ - return agent->call != NULL; -} - ofono_bool_t stk_agent_matches(struct stk_agent *agent, const char *path, const char *sender) { @@ -127,7 +122,7 @@ void stk_agent_set_removed_notify(struct stk_agent *agent, void stk_agent_request_cancel(struct stk_agent *agent) { - if (!stk_agent_busy(agent)) + if (agent->call == NULL) return; dbus_pending_call_cancel(agent->call); @@ -138,7 +133,7 @@ void stk_agent_request_cancel(struct stk_agent *agent) void stk_agent_free(struct stk_agent *agent) { DBusConnection *conn = ofono_dbus_get_connection(); - gboolean busy = stk_agent_busy(agent); + gboolean busy = agent->call != NULL; if (agent->disconnect_watch) { if (busy) diff --git a/src/stkagent.h b/src/stkagent.h index f2f27e65..d9e79dcb 100644 --- a/src/stkagent.h +++ b/src/stkagent.h @@ -59,7 +59,6 @@ void stk_agent_set_removed_notify(struct stk_agent *agent, ofono_destroy_func removed_cb, void *user_data); -ofono_bool_t stk_agent_busy(struct stk_agent *agent); ofono_bool_t stk_agent_matches(struct stk_agent *agent, const char *path, const char *sender); |