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

hso: port modem_create_bearer to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-19 03:06:47 -07:00
committed by Aleksander Morgado
parent d23dd2343a
commit 0131f9b006
1 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/option/mm-broadband-modem-hso.c
View File

@@ -62,52 +62,41 @@ modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
MMBaseBearer *bearer; return g_task_propagate_pointer (G_TASK (res), error);
bearer = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
mm_dbg ("New %s bearer created at DBus path '%s'",
MM_IS_BROADBAND_BEARER_HSO (bearer) ? "HSO" : "Generic",
mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
} }
static void static void
broadband_bearer_new_ready (GObject *source, broadband_bearer_new_ready (GObject *source,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMBaseBearer *bearer = NULL; MMBaseBearer *bearer = NULL;
GError *error = NULL; GError *error = NULL;
bearer = mm_broadband_bearer_new_finish (res, &error); bearer = mm_broadband_bearer_new_finish (res, &error);
if (!bearer) if (!bearer)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gpointer (simple, g_task_return_pointer (task, bearer, g_object_unref);
bearer,
g_object_unref); g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
broadband_bearer_hso_new_ready (GObject *source, broadband_bearer_hso_new_ready (GObject *source,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMBaseBearer *bearer = NULL; MMBaseBearer *bearer = NULL;
GError *error = NULL; GError *error = NULL;
bearer = mm_broadband_bearer_hso_new_finish (res, &error); bearer = mm_broadband_bearer_hso_new_finish (res, &error);
if (!bearer) if (!bearer)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gpointer (simple, g_task_return_pointer (task, bearer, g_object_unref);
bearer,
g_object_unref); g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -116,12 +105,9 @@ modem_create_bearer (MMIfaceModem *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_create_bearer);
if (mm_bearer_properties_get_ip_type (properties) & if (mm_bearer_properties_get_ip_type (properties) &
(MM_BEARER_IP_FAMILY_IPV6 | MM_BEARER_IP_FAMILY_IPV4V6)) { (MM_BEARER_IP_FAMILY_IPV6 | MM_BEARER_IP_FAMILY_IPV4V6)) {
@@ -130,7 +116,7 @@ modem_create_bearer (MMIfaceModem *self,
properties, properties,
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_new_ready, (GAsyncReadyCallback)broadband_bearer_new_ready,
result); task);
return; return;
} }
@@ -139,7 +125,7 @@ modem_create_bearer (MMIfaceModem *self,
properties, properties,
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_hso_new_ready, (GAsyncReadyCallback)broadband_bearer_hso_new_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/