[gnome-control-center] wwan: Replace deprecated nm_device_disconnect



commit a793e49acdd8c175f668d5cf34a70e8437dd5c72
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue May 31 15:35:16 2022 +1200

    wwan: Replace deprecated nm_device_disconnect

 panels/wwan/cc-wwan-data.c | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/panels/wwan/cc-wwan-data.c b/panels/wwan/cc-wwan-data.c
index c10148537..ca54c731f 100644
--- a/panels/wwan/cc-wwan-data.c
+++ b/panels/wwan/cc-wwan-data.c
@@ -806,6 +806,30 @@ cc_wwan_data_activated_cb (GObject      *object,
     g_warning ("Error: %s", error->message);
 }
 
+static void
+cc_wwan_data_disconnect_cb (GObject      *object,
+                            GAsyncResult *result,
+                            gpointer      user_data)
+{
+  CcWwanData *self;
+  g_autoptr(GTask) task = user_data;
+  g_autoptr(GError) error = NULL;
+
+  self = g_task_get_source_object (G_TASK (task));
+  if (nm_device_disconnect_finish (self->nm_device, result, &error))
+    {
+      g_clear_object (&self->active_connection);
+      g_task_return_boolean (task, TRUE);
+    }
+  else
+    {
+      g_task_return_error (task, g_steal_pointer (&error));
+    }
+
+  if (error)
+    g_warning ("Error: %s", error->message);
+}
+
 static void
 cc_wwan_data_settings_saved_cb (GObject      *object,
                                 GAsyncResult *result,
@@ -838,15 +862,10 @@ cc_wwan_data_settings_saved_cb (GObject      *object,
     }
   else
     {
-      if (nm_device_disconnect (self->nm_device, cancellable, &error))
-        {
-          g_clear_object (&self->active_connection);
-          g_task_return_boolean (task, TRUE);
-        }
-      else
-        {
-          g_task_return_error (task, g_steal_pointer (&error));
-        }
+      nm_device_disconnect_async (self->nm_device,
+                                  cancellable,
+                                  cc_wwan_data_disconnect_cb,
+                                  g_steal_pointer (&task));
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]