diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-10 16:06:20 -0700 |
|---|---|---|
| committer | Ben Chan <benchan@chromium.org> | 2017-07-11 10:30:39 -0700 |
| commit | fb38601ef4b388506008067f375a25330392c07d (patch) | |
| tree | b78ebe981bedd60b0d6edc93c626866495b85b69 /src | |
| parent | 99bb49d814172f555caeb59ced445f3118bac625 (diff) | |
broadband-modem-mbim: port modem_load_supported_ip_families to use GTask
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index 9e1386f5..19cac5e7 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -454,11 +454,15 @@ modem_load_supported_ip_families_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return MM_BEARER_IP_FAMILY_NONE; + GError *inner_error = NULL; + gssize value; - return (MMBearerIpFamily) GPOINTER_TO_UINT (g_simple_async_result_get_op_res_gpointer ( - G_SIMPLE_ASYNC_RESULT (res))); + value = g_task_propagate_int (G_TASK (res), &inner_error); + if (inner_error) { + g_propagate_error (error, inner_error); + return MM_BEARER_IP_FAMILY_NONE; + } + return (MMBearerIpFamily)value; } static void @@ -466,22 +470,15 @@ modem_load_supported_ip_families (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_load_supported_ip_families); + GTask *task; + task = g_task_new (self, NULL, callback, user_data); /* Assume IPv4 + IPv6 + IPv4v6 supported */ - g_simple_async_result_set_op_res_gpointer ( - result, - GUINT_TO_POINTER (MM_BEARER_IP_FAMILY_IPV4 | - MM_BEARER_IP_FAMILY_IPV6 | - MM_BEARER_IP_FAMILY_IPV4V6), - NULL); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + g_task_return_int (task, + MM_BEARER_IP_FAMILY_IPV4 | + MM_BEARER_IP_FAMILY_IPV6 | + MM_BEARER_IP_FAMILY_IPV4V6); + g_object_unref (task); } /*****************************************************************************/ |