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

sierra: port disconnect_3gpp to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-08 16:57:14 -07:00
committed by Aleksander Morgado
parent 4c2ebaba16
commit d0dc8b97a7
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,13 +355,13 @@ disconnect_3gpp_finish (MMBroadbandBearer *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_disconnect_3gpp_ready (MMBroadbandBearer *self, parent_disconnect_3gpp_ready (MMBroadbandBearer *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
@@ -370,15 +370,14 @@ parent_disconnect_3gpp_ready (MMBroadbandBearer *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
disconnect_scact_ready (MMBaseModem *modem, disconnect_scact_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
@@ -389,9 +388,8 @@ disconnect_scact_ready (MMBaseModem *modem,
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
@@ -404,14 +402,11 @@ disconnect_3gpp (MMBroadbandBearer *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
g_assert (primary != NULL); g_assert (primary != NULL);
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
disconnect_3gpp);
if (!MM_IS_PORT_SERIAL_AT (data)) { if (!MM_IS_PORT_SERIAL_AT (data)) {
gchar *command; gchar *command;
@@ -426,7 +421,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
FALSE, /* raw */ FALSE, /* raw */
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)disconnect_scact_ready, (GAsyncReadyCallback)disconnect_scact_ready,
result); task);
g_free (command); g_free (command);
return; return;
} }
@@ -440,7 +435,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
data, data,
cid, cid,
(GAsyncReadyCallback)parent_disconnect_3gpp_ready, (GAsyncReadyCallback)parent_disconnect_3gpp_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/