diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-10 15:51:14 -0700 |
|---|---|---|
| committer | Ben Chan <benchan@chromium.org> | 2017-07-11 10:30:39 -0700 |
| commit | 234d7810f54acf1788993b81d35d5e309db4aaa8 (patch) | |
| tree | 874e4c03d1f2b6ed0a8b1b75b8df1a5732cbea01 | |
| parent | 6cf6eeb0aad71874746674b3dd23c67b00222cca (diff) | |
broadband-modem-mbim: port modem_load_model to use GTask
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index 92370674..193b4d0a 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -266,10 +266,7 @@ modem_load_model_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - return g_strdup_printf ("MBIM [%04X:%04X]", - (mm_base_modem_get_vendor_id (MM_BASE_MODEM (self)) & 0xFFFF), - (mm_base_modem_get_product_id (MM_BASE_MODEM (self)) & 0xFFFF)); - + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -277,14 +274,16 @@ modem_load_model (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + gchar *model; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_load_model); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + model = g_strdup_printf ("MBIM [%04X:%04X]", + (mm_base_modem_get_vendor_id (MM_BASE_MODEM (self)) & 0xFFFF), + (mm_base_modem_get_product_id (MM_BASE_MODEM (self)) & 0xFFFF)); + + task = g_task_new (self, NULL, callback, user_data); + g_task_return_pointer (task, model, g_free); + g_object_unref (task); } /*****************************************************************************/ |