diff options
| -rw-r--r-- | src/mm-broadband-modem.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 6aff6f9c..466627f3 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -1245,17 +1245,21 @@ modem_load_unlock_required_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return MM_MODEM_LOCK_UNKNOWN; + GError *inner_error = NULL; + gssize value; - return (MMModemLock) GPOINTER_TO_UINT (g_simple_async_result_get_op_res_gpointer ( - G_SIMPLE_ASYNC_RESULT (res))); + value = g_task_propagate_int (G_TASK (res), &inner_error); + if (inner_error) { + g_propagate_error (error, inner_error); + return MM_MODEM_LOCK_UNKNOWN; + } + return (MMModemLock)value; } static void cpin_query_ready (MMIfaceModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { MMModemLock lock = MM_MODEM_LOCK_UNKNOWN; @@ -1264,9 +1268,8 @@ cpin_query_ready (MMIfaceModem *self, result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); if (error) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_error (task, error); + g_object_unref (task); return; } @@ -1294,11 +1297,8 @@ cpin_query_ready (MMIfaceModem *self, } } - g_simple_async_result_set_op_res_gpointer (simple, - GUINT_TO_POINTER (lock), - NULL); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_int (task, lock); + g_object_unref (task); } static void @@ -1306,21 +1306,15 @@ modem_load_unlock_required (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_load_unlock_required); + task = g_task_new (self, NULL, callback, user_data); /* CDMA-only modems don't need this */ if (mm_iface_modem_is_cdma_only (self)) { mm_dbg ("Skipping unlock check in CDMA-only modem..."); - g_simple_async_result_set_op_res_gpointer (result, - GUINT_TO_POINTER (MM_MODEM_LOCK_NONE), - NULL); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + g_task_return_int (task, MM_MODEM_LOCK_NONE); + g_object_unref (task); return; } @@ -1330,7 +1324,7 @@ modem_load_unlock_required (MMIfaceModem *self, 3, FALSE, (GAsyncReadyCallback)cpin_query_ready, - result); + task); } /*****************************************************************************/ |