diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-11 14:28:37 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-10-20 17:20:24 +0200 |
| commit | 607dee3a9553305432a3d513c8b777edee4d94dd (patch) | |
| tree | bcca64a1b9cf91e27db34e8b34cca8fdc72fd612 | |
| parent | e365cf531ccbdd4101ae5507ba439fe27875f758 (diff) | |
broadband-modem-qmi: port modem_3gpp_load_operator_code to use GTask
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index a34fdb50..a5e40bfe 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -4412,37 +4412,33 @@ modem_3gpp_load_operator_name (MMIfaceModem3gpp *_self, /* Load operator code (3GPP interface) */ static gchar * -modem_3gpp_load_operator_code_finish (MMIfaceModem3gpp *_self, +modem_3gpp_load_operator_code_finish (MMIfaceModem3gpp *self, GAsyncResult *res, GError **error) { - MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self); - - if (self->priv->current_operator_id) - return g_strdup (self->priv->current_operator_id); - - g_set_error (error, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Current operator MCC/MNC is still unknown"); - return NULL; + return g_task_propagate_pointer (G_TASK (res), error); } static void -modem_3gpp_load_operator_code (MMIfaceModem3gpp *self, +modem_3gpp_load_operator_code (MMIfaceModem3gpp *_self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self); + GTask *task; - /* Just finish the async operation */ - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_load_operator_code); - g_simple_async_result_set_op_res_gboolean (result, TRUE); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + task = g_task_new (self, NULL, callback, user_data); + + if (self->priv->current_operator_id) + g_task_return_pointer (task, + g_strdup (self->priv->current_operator_id), + g_free); + else + g_task_return_new_error (task, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Current operator MCC/MNC is still unknown"); + g_object_unref (task); } /*****************************************************************************/ |