Hi Andrew,
On 10/13/2010 08:54 AM, Andrzej Zaborowski wrote:
> The assumption is now that stk_alpha_id_set will handle NULL
> or empty alphaIds or icons.
> ---
> src/stk.c | 36 ++++++++++--------------------------
> 1 files changed, 10 insertions(+), 26 deletions(-)
>
I applied most of the chunks in this patch except for:
> @@ -1883,9 +1872,7 @@ static void send_dtmf_cancel(struct ofono_stk *stk)
> stk->respond_on_exit = FALSE;
> stk->extern_req->cancelled = TRUE;
>
> - if (stk->pending_cmd->send_dtmf.alpha_id &&
> - stk->pending_cmd->send_dtmf.alpha_id[0])
> - stk_alpha_id_unset(stk);
> + stk_alpha_id_unset(stk);
> }
>
> static void dtmf_sent_cb(const struct ofono_error *error, void *user_data)
> @@ -1904,9 +1891,7 @@ static void dtmf_sent_cb(const struct ofono_error
> *error, void *user_data)
>
> stk->respond_on_exit = FALSE;
>
> - if (stk->pending_cmd->send_dtmf.alpha_id &&
> - stk->pending_cmd->send_dtmf.alpha_id[0])
> - stk_alpha_id_unset(stk);
> + stk_alpha_id_unset(stk);
>
> if (error->type == OFONO_ERROR_TYPE_FAILURE &&
> error->error == ENOENT) {
> @@ -2006,8 +1991,7 @@ static gboolean handle_command_send_dtmf(const struct
> stk_command *cmd,
> return TRUE;
> }
>
> - if (cmd->send_dtmf.alpha_id && cmd->send_dtmf.alpha_id[0])
> - stk_alpha_id_set(stk, cmd->send_dtmf.alpha_id);
> + stk_alpha_id_set(stk, cmd->send_dtmf.alpha_id, &cmd->send_dtmf.icon_id);
>
> /*
> * Note that we don't strictly require an agent to be connected,
Thanks.
Regards,
-Denis
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
