colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

huawei: port modem_voice_enable_unsolicited_events to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-08-01 11:48:57 -07:00
committed by Aleksander Morgado
parent 5e8a7aad76
commit 68075a23a7
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -3125,23 +3125,22 @@ modem_voice_enable_unsolicited_events_finish (MMIfaceModemVoice *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) 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 static void
own_voice_enable_unsolicited_events_ready (MMBaseModem *self, own_voice_enable_unsolicited_events_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_sequence_full_finish (self, res, NULL, &error); mm_base_modem_at_sequence_full_finish (self, res, NULL, &error);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gboolean (simple, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static const MMBaseModemAtCommand unsolicited_voice_enable_sequence[] = { static const MMBaseModemAtCommand unsolicited_voice_enable_sequence[] = {
@@ -3153,14 +3152,13 @@ static const MMBaseModemAtCommand unsolicited_voice_enable_sequence[] = {
static void static void
parent_voice_enable_unsolicited_events_ready (MMIfaceModemVoice *self, parent_voice_enable_unsolicited_events_ready (MMIfaceModemVoice *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
if (!iface_modem_voice_parent->enable_unsolicited_events_finish (self, res, &error)) { if (!iface_modem_voice_parent->enable_unsolicited_events_finish (self, res, &error)) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -3173,7 +3171,7 @@ parent_voice_enable_unsolicited_events_ready (MMIfaceModemVoice *self,
NULL, /* response_processor_context_free */ NULL, /* response_processor_context_free */
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)own_voice_enable_unsolicited_events_ready, (GAsyncReadyCallback)own_voice_enable_unsolicited_events_ready,
simple); task);
} }
static void static void
@@ -3181,18 +3179,15 @@ modem_voice_enable_unsolicited_events (MMIfaceModemVoice *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
modem_voice_enable_unsolicited_events);
/* Chain up parent's enable */ /* Chain up parent's enable */
iface_modem_voice_parent->enable_unsolicited_events ( iface_modem_voice_parent->enable_unsolicited_events (
self, self,
(GAsyncReadyCallback)parent_voice_enable_unsolicited_events_ready, (GAsyncReadyCallback)parent_voice_enable_unsolicited_events_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/