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

sierra: port load_supported_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-08 17:09:08 -07:00
committed by Aleksander Morgado
parent 8f129d64ed
commit abff4adf62
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/sierra/mm-broadband-modem-sierra.c
View File

@@ -523,16 +523,13 @@ load_supported_modes_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return g_task_propagate_pointer (G_TASK (res), error);
return NULL;
return g_array_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
} }
static void static void
parent_load_supported_modes_ready (MMIfaceModem *self, parent_load_supported_modes_ready (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
GArray *all; GArray *all;
@@ -542,17 +539,15 @@ parent_load_supported_modes_ready (MMIfaceModem *self,
all = iface_modem_parent->load_supported_modes_finish (self, res, &error); all = iface_modem_parent->load_supported_modes_finish (self, res, &error);
if (!all) { if (!all) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
/* CDMA-only modems don't support changing modes, default to parent's */ /* CDMA-only modems don't support changing modes, default to parent's */
if (!mm_iface_modem_is_3gpp (self)) { if (!mm_iface_modem_is_3gpp (self)) {
g_simple_async_result_set_op_res_gpointer (simple, all, (GDestroyNotify) g_array_unref); g_task_return_pointer (task, all, (GDestroyNotify) g_array_unref);
g_simple_async_result_complete_in_idle (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -598,9 +593,8 @@ parent_load_supported_modes_ready (MMIfaceModem *self,
g_array_unref (all); g_array_unref (all);
g_array_unref (combinations); g_array_unref (combinations);
g_simple_async_result_set_op_res_gpointer (simple, filtered, (GDestroyNotify) g_array_unref); g_task_return_pointer (task, filtered, (GDestroyNotify) g_array_unref);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -612,10 +606,7 @@ load_supported_modes (MMIfaceModem *self,
iface_modem_parent->load_supported_modes ( iface_modem_parent->load_supported_modes (
MM_IFACE_MODEM (self), MM_IFACE_MODEM (self),
(GAsyncReadyCallback)parent_load_supported_modes_ready, (GAsyncReadyCallback)parent_load_supported_modes_ready,
g_simple_async_result_new (G_OBJECT (self), g_task_new (self, NULL, callback, user_data));
callback,
user_data,
load_supported_modes));
} }
/*****************************************************************************/ /*****************************************************************************/