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

mbm: port modem_create_bearer to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-26 05:31:52 -07:00
committed by Aleksander Morgado
parent 9f573d3bcf
commit 2e7aff84a6
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/mbm/mm-broadband-modem-mbm.c
View File

@@ -89,31 +89,24 @@ 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 MBM bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer));
return g_object_ref (bearer);
} }
static void static void
broadband_bearer_mbm_new_ready (GObject *source, broadband_bearer_mbm_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_mbm_new_finish (res, &error); bearer = mm_broadband_bearer_mbm_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
@@ -122,19 +115,12 @@ modem_create_bearer (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_create_bearer);
mm_dbg ("Creating MBM bearer..."); mm_dbg ("Creating MBM bearer...");
mm_broadband_bearer_mbm_new (MM_BROADBAND_MODEM_MBM (self), mm_broadband_bearer_mbm_new (MM_BROADBAND_MODEM_MBM (self),
properties, properties,
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_mbm_new_ready, (GAsyncReadyCallback)broadband_bearer_mbm_new_ready,
result); g_task_new (self, NULL, callback, user_data));
} }
/*****************************************************************************/ /*****************************************************************************/