commit 715e67c489294a0534754e19a73d2c7023448fab
author Aleksander Morgado <aleksander@aleksander.es> Mon Mar 01 10:27:28 2021 +0100
committer Aleksander Morgado <aleksander@aleksander.es> Mon Mar 01 09:52:52 2021 +0000
tree a61c847e30558e48b7ef822b3288a19f9d95f20d
parent bb7377eb77973390eb7aed5a7521bbcf7b4942eb

libqmi-glib,net-port-manager: fix build with GLib 2.48

The g_ptr_array_steal_index_fast() method was introduced in 2.58,
fallback to use g_ptr_array_remove_index_fast() instead.

src/libqmi-glib/qmi-net-port-manager.c

diff --git a/src/libqmi-glib/qmi-net-port-manager.c b/src/libqmi-glib/qmi-net-port-manager.c
index 70cb052..461fc36 100644
--- a/src/libqmi-glib/qmi-net-port-manager.c
+++ b/src/libqmi-glib/qmi-net-port-manager.c
@@ -159,7 +159,10 @@
                              GAsyncResult      *res,
                              GTask             *task)
 {
-    GError *error = NULL;
+    DelAllLinksContext *ctx;
+    GError             *error = NULL;
+
+    ctx = g_task_get_task_data (task);
 
     if (!qmi_net_port_manager_del_link_finish (self, res, &error)) {
         g_task_return_error (task, error);
@@ -167,6 +170,7 @@
         return;
     }
 
+    g_ptr_array_remove_index_fast (ctx->links, 0);
     delete_next_link (task);
 }
 
@@ -175,7 +179,6 @@
 {
     QmiNetPortManager  *self;
     DelAllLinksContext *ctx;
-    g_autofree gchar   *link_name = NULL;
 
     self = g_task_get_source_object (task);
     ctx = g_task_get_task_data (task);
@@ -186,10 +189,8 @@
         return;
     }
 
-    link_name = g_ptr_array_steal_index_fast (ctx->links, 0);
-
     qmi_net_port_manager_del_link (self,
-                                   link_name,
+                                   g_ptr_array_index (ctx->links, 0),
                                    QMI_DEVICE_MUX_ID_UNBOUND,
                                    5,
                                    g_task_get_cancellable (task),