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

broadband-modem: port modem_3gpp_setup_unsolicited_registration_events to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-12 13:10:17 -07:00
committed by Aleksander Morgado
parent 7ee52bb99a
commit ece9b87a67
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mm-broadband-modem.c
View File

@@ -3715,7 +3715,7 @@ modem_3gpp_setup_unsolicited_registration_events_finish (MMIfaceModem3gpp *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
@@ -3769,16 +3769,11 @@ modem_3gpp_setup_unsolicited_registration_events (MMIfaceModem3gpp *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result;
MMPortSerialAt *ports[2]; MMPortSerialAt *ports[2];
GPtrArray *array; GPtrArray *array;
guint i; guint i;
guint j; guint j;
GTask *task;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_3gpp_setup_unsolicited_registration_events);
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self)); ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
@@ -3802,9 +3797,9 @@ modem_3gpp_setup_unsolicited_registration_events (MMIfaceModem3gpp *self,
} }
mm_3gpp_creg_regex_destroy (array); mm_3gpp_creg_regex_destroy (array);
g_simple_async_result_set_op_res_gboolean (result, TRUE); task = g_task_new (self, NULL, callback, user_data);
g_simple_async_result_complete_in_idle (result); g_task_return_boolean (task, TRUE);
g_object_unref (result); g_object_unref (task);
} }
/*****************************************************************************/ /*****************************************************************************/