diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-07-29 23:51:23 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-07-30 17:19:56 -0500 |
| commit | 3434540d8b4e3692abbe1e171b6a575c6a77c656 (patch) | |
| tree | 8c07ca3d94845f5f0447cedc2f4705a3d61f2ec8 /src | |
| parent | 69ea6cd7a0516d59307b1fb511ffeab77b8b8b81 (diff) | |
| download | ofono-3434540d8b4e3692abbe1e171b6a575c6a77c656.tar.bz2 | |
stkagent: Make DisplayText invocation match API
For now we match the proposed API until we decide that changes are
needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/stk.c | 3 | ||||
| -rw-r--r-- | src/stkagent.c | 4 | ||||
| -rw-r--r-- | src/stkagent.h | 2 |
3 files changed, 3 insertions, 6 deletions
@@ -1045,7 +1045,6 @@ static gboolean handle_command_display_text(const struct stk_command *cmd, int timeout = stk->short_timeout * 1000; struct stk_command_display_text *dt = &stk->pending_cmd->display_text; uint8_t qualifier = stk->pending_cmd->qualifier; - ofono_bool_t confirm = (qualifier & (1 << 7)) != 0; ofono_bool_t priority = (qualifier & (1 << 0)) != 0; if (dt->duration.interval) { @@ -1064,7 +1063,7 @@ static gboolean handle_command_display_text(const struct stk_command *cmd, stk->session_ended = FALSE; stk_agent_display_text(stk->current_agent, dt->text, 0, priority, - confirm, request_text_cb, stk, timeout); + request_text_cb, stk, timeout); return cmd->display_text.immediate_response; } diff --git a/src/stkagent.c b/src/stkagent.c index 18c4fc04..20d0d052 100644 --- a/src/stkagent.c +++ b/src/stkagent.c @@ -392,12 +392,11 @@ error: int stk_agent_display_text(struct stk_agent *agent, const char *text, uint8_t icon_id, ofono_bool_t urgent, - ofono_bool_t ack, stk_agent_display_text_cb cb, + stk_agent_display_text_cb cb, void *user_data, int timeout) { DBusConnection *conn = ofono_dbus_get_connection(); dbus_bool_t priority = urgent; - dbus_bool_t confirm = ack; agent->msg = dbus_message_new_method_call(agent->bus, agent->path, OFONO_SIM_APP_INTERFACE, @@ -409,7 +408,6 @@ int stk_agent_display_text(struct stk_agent *agent, const char *text, DBUS_TYPE_STRING, &text, DBUS_TYPE_BYTE, &icon_id, DBUS_TYPE_BOOLEAN, &priority, - DBUS_TYPE_BOOLEAN, &confirm, DBUS_TYPE_INVALID); if (dbus_connection_send_with_reply(conn, agent->msg, &agent->call, diff --git a/src/stkagent.h b/src/stkagent.h index 0ed056a7..625217ad 100644 --- a/src/stkagent.h +++ b/src/stkagent.h @@ -73,7 +73,7 @@ int stk_agent_request_selection(struct stk_agent *agent, int stk_agent_display_text(struct stk_agent *agent, const char *text, uint8_t icon_id, ofono_bool_t urgent, - ofono_bool_t ack, stk_agent_display_text_cb cb, + stk_agent_display_text_cb cb, void *user_data, int timeout); void append_menu_items_variant(DBusMessageIter *iter, |