broadband-modem: port modem_load_unlock_required to use GTask

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))
+    GError *inner_error = NULL;
-        return MM_MODEM_LOCK_UNKNOWN;
+    gssize value;
 
-    return (MMModemLock) 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_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_task_return_error (task, error);
-        g_simple_async_result_complete (simple);
+        g_object_unref (task);
-        g_object_unref (simple);
         return;
     }
 
@@ -1294,11 +1297,8 @@ cpin_query_ready (MMIfaceModem *self,
         }
     }
 
-    g_simple_async_result_set_op_res_gpointer (simple,
+    g_task_return_int (task, lock);
-                                               GUINT_TO_POINTER (lock),
+    g_object_unref (task);
-                                               NULL);
-    g_simple_async_result_complete (simple);
-    g_object_unref (simple);
 }
 
 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),
+    task = g_task_new (self, NULL, callback, user_data);
-                                        callback,
-                                        user_data,
-                                        modem_load_unlock_required);
 
     /* 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,
+        g_task_return_int (task, MM_MODEM_LOCK_NONE);
-                                                   GUINT_TO_POINTER (MM_MODEM_LOCK_NONE),
+        g_object_unref (task);
-                                                   NULL);
-        g_simple_async_result_complete_in_idle (result);
-        g_object_unref (result);
         return;
     }
 
@@ -1330,7 +1324,7 @@ modem_load_unlock_required (MMIfaceModem *self,
                               3,
                               FALSE,
                               (GAsyncReadyCallback)cpin_query_ready,
-                              result);
+                              task);
 }
 
 /*****************************************************************************/