From 6cf6eeb0aad71874746674b3dd23c67b00222cca Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Mon, 10 Jul 2017 15:49:03 -0700 Subject: broadband-modem-mbim: port modem_load_manufacturer to use GTask --- src/mm-broadband-modem-mbim.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index 0d1126d4..92370674 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -240,7 +240,7 @@ modem_load_manufacturer_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - return g_strdup (mm_base_modem_get_plugin (MM_BASE_MODEM (self))); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -248,14 +248,14 @@ modem_load_manufacturer (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; + gchar *manufacturer; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_load_manufacturer); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + manufacturer = g_strdup (mm_base_modem_get_plugin (MM_BASE_MODEM (self))); + + task = g_task_new (self, NULL, callback, user_data); + g_task_return_pointer (task, manufacturer, g_free); + g_object_unref (task); } /*****************************************************************************/ -- cgit v1.2.3-70-g09d2