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

thuraya: port load_supported_modes to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-09-13 22:30:03 +02:00
parent e072f4bc77
commit d9de874db3
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/thuraya/mm-broadband-modem-thuraya.c
View File

@@ -91,26 +91,23 @@ load_operator_name (MMIfaceModem3gpp *self,
/* Load supported modes (Modem inteface) */ /* Load supported modes (Modem inteface) */
static GArray * static GArray *
load_supported_modes_finish (MMIfaceModem *self, load_supported_modes_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return g_array_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res))); return g_task_propagate_pointer (G_TASK (res), error);
} }
static void static void
load_supported_modes (MMIfaceModem *self, load_supported_modes (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
GArray *combinations; GArray *combinations;
MMModemModeCombination mode; MMModemModeCombination mode;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
load_supported_modes);
/* Build list of combinations */ /* Build list of combinations */
combinations = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1); combinations = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1);
@@ -120,9 +117,8 @@ load_supported_modes (MMIfaceModem *self,
mode.preferred = MM_MODEM_MODE_NONE; mode.preferred = MM_MODEM_MODE_NONE;
g_array_append_val (combinations, mode); g_array_append_val (combinations, mode);
g_simple_async_result_set_op_res_gpointer (result, combinations, (GDestroyNotify) g_array_unref); g_task_return_pointer (task, combinations, (GDestroyNotify) g_array_unref);
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
} }
/*****************************************************************************/ /*****************************************************************************/