broadband-modem-qmi: port modem_load_manufacturer to use GTask

1 files changed, 8 insertions, 24 deletions

diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 9c5d2268..48c64913 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -927,20 +927,13 @@ modem_load_manufacturer_finish (MMIfaceModem *self,
                                 GAsyncResult *res,
                                 GError **error)
 {
-    gchar *manufacturer;
-
-    if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
-        return NULL;
-
-    manufacturer = g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
-    mm_dbg ("loaded manufacturer: %s", manufacturer);
-    return manufacturer;
+    return g_task_propagate_pointer (G_TASK (res), error);
 }
 
 static void
 dms_get_manufacturer_ready (QmiClientDms *client,
                             GAsyncResult *res,
-                            GSimpleAsyncResult *simple)
+                            GTask *task)
 {
     QmiMessageDmsGetManufacturerOutput *output = NULL;
     GError *error = NULL;
@@ -948,24 +941,21 @@ dms_get_manufacturer_ready (QmiClientDms *client,
     output = qmi_client_dms_get_manufacturer_finish (client, res, &error);
     if (!output) {
         g_prefix_error (&error, "QMI operation failed: ");
-        g_simple_async_result_take_error (simple, error);
+        g_task_return_error (task, error);
     } else if (!qmi_message_dms_get_manufacturer_output_get_result (output, &error)) {
         g_prefix_error (&error, "Couldn't get Manufacturer: ");
-        g_simple_async_result_take_error (simple, error);
+        g_task_return_error (task, error);
     } else {
         const gchar *str;
 
         qmi_message_dms_get_manufacturer_output_get_manufacturer (output, &str, NULL);
-        g_simple_async_result_set_op_res_gpointer (simple,
-                                                   g_strdup (str),
-                                                   g_free);
+        g_task_return_pointer (task, g_strdup (str), g_free);
     }
 
     if (output)
         qmi_message_dms_get_manufacturer_output_unref (output);
 
-    g_simple_async_result_complete (simple);
-    g_object_unref (simple);
+    g_object_unref (task);
 }
 
 static void
@@ -973,26 +963,20 @@ modem_load_manufacturer (MMIfaceModem *self,
                          GAsyncReadyCallback callback,
                          gpointer user_data)
 {
-    GSimpleAsyncResult *result;
     QmiClient *client = NULL;
 
-    if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
+    if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
                             QMI_SERVICE_DMS, &client,
                             callback, user_data))
         return;
 
-    result = g_simple_async_result_new (G_OBJECT (self),
-                                        callback,
-                                        user_data,
-                                        modem_load_manufacturer);
-
     mm_dbg ("loading manufacturer...");
     qmi_client_dms_get_manufacturer (QMI_CLIENT_DMS (client),
                                      NULL,
                                      5,
                                      NULL,
                                      (GAsyncReadyCallback)dms_get_manufacturer_ready,
-                                     result);
+                                     g_task_new (self, NULL, callback, user_data));
 }
 
 /*****************************************************************************/