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

broadband-modem: port modem_load_supported_ip_families to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-06 15:22:16 -07:00
committed by Aleksander Morgado
parent 8c9bcd76c2
commit 4da7cf96ac
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1623,17 +1623,21 @@ modem_load_supported_ip_families_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) GError *inner_error = NULL;
return MM_BEARER_IP_FAMILY_NONE; gssize value;
return (MMBearerIpFamily) GPOINTER_TO_UINT (g_simple_async_result_get_op_res_gpointer ( value = g_task_propagate_int (G_TASK (res), &inner_error);
G_SIMPLE_ASYNC_RESULT (res))); if (inner_error) {
g_propagate_error (error, inner_error);
return MM_BEARER_IP_FAMILY_NONE;
}
return (MMBearerIpFamily)value;
} }
static void static void
supported_ip_families_cgdcont_test_ready (MMBaseModem *self, supported_ip_families_cgdcont_test_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
const gchar *response; const gchar *response;
GError *error = NULL; GError *error = NULL;
@@ -1651,12 +1655,11 @@ supported_ip_families_cgdcont_test_ready (MMBaseModem *self,
} }
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gpointer (simple, GUINT_TO_POINTER (mask), NULL); g_task_return_int (task, mask);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -1664,21 +1667,14 @@ modem_load_supported_ip_families (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
mm_dbg ("loading supported IP families..."); mm_dbg ("loading supported IP families...");
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
modem_load_supported_ip_families);
if (mm_iface_modem_is_cdma_only (self)) { if (mm_iface_modem_is_cdma_only (self)) {
g_simple_async_result_set_op_res_gpointer ( g_task_return_int (task, MM_BEARER_IP_FAMILY_IPV4);
result, g_object_unref (task);
GUINT_TO_POINTER (MM_BEARER_IP_FAMILY_IPV4),
NULL);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return; return;
} }
@@ -1689,7 +1685,7 @@ modem_load_supported_ip_families (MMIfaceModem *self,
3, 3,
TRUE, /* allow caching, it's a test command */ TRUE, /* allow caching, it's a test command */
(GAsyncReadyCallback)supported_ip_families_cgdcont_test_ready, (GAsyncReadyCallback)supported_ip_families_cgdcont_test_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/