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

broadband-modem-mbim: port enabling_started to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-10 16:20:23 -07:00
parent e0eb23d9a6
commit e8ffefaf6f
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mm-broadband-modem-mbim.c
View File

@@ -1482,13 +1482,13 @@ enabling_started_finish (MMBroadbandModem *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
parent_enabling_started_ready (MMBroadbandModem *self, parent_enabling_started_ready (MMBroadbandModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
@@ -1502,9 +1502,8 @@ parent_enabling_started_ready (MMBroadbandModem *self,
g_error_free (error); g_error_free (error);
} }
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 void static void
@@ -1512,16 +1511,13 @@ enabling_started (MMBroadbandModem *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,
enabling_started);
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_parent_class)->enabling_started ( MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_mbim_parent_class)->enabling_started (
self, self,
(GAsyncReadyCallback)parent_enabling_started_ready, (GAsyncReadyCallback)parent_enabling_started_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/