huawei: port modem_voice_disable_unsolicited_events to use GTask

This commit is contained in:
Ben Chan
2017-08-01 11:50:16 -07:00
committed by Aleksander Morgado
parent 68075a23a7
commit 8df63e385c

View File

@@ -3198,23 +3198,22 @@ modem_voice_disable_unsolicited_events_finish (MMIfaceModemVoice *self,
GAsyncResult *res,
GError **error)
{
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
return g_task_propagate_boolean (G_TASK (res), error);
}
static void
own_voice_disable_unsolicited_events_ready (MMBaseModem *self,
GAsyncResult *res,
GSimpleAsyncResult *simple)
GTask *task)
{
GError *error = NULL;
mm_base_modem_at_sequence_full_finish (self, res, NULL, &error);
if (error)
g_simple_async_result_take_error (simple, error);
g_task_return_error (task, error);
else
g_simple_async_result_set_op_res_gboolean (simple, TRUE);
g_simple_async_result_complete (simple);
g_object_unref (simple);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
}
static const MMBaseModemAtCommand unsolicited_voice_disable_sequence[] = {
@@ -3228,12 +3227,9 @@ modem_voice_disable_unsolicited_events (MMIfaceModemVoice *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *simple;
GTask *task;
simple = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_voice_disable_unsolicited_events);
task = g_task_new (self, NULL, callback, user_data);
/* No unsolicited events disabling in parent */
@@ -3245,7 +3241,7 @@ modem_voice_disable_unsolicited_events (MMIfaceModemVoice *self,
NULL, /* response_processor_context_free */
NULL, /* cancellable */
(GAsyncReadyCallback)own_voice_disable_unsolicited_events_ready,
simple);
task);
}
/*****************************************************************************/