From ddc739f38b93b93f0d679a0c7131265f5023bd1c Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Fri, 1 Apr 2022 19:20:32 +0200
Subject: [PATCH] device-list: Remove unnecessary native argument

We can simply look it up from within the function.
---
 src/linux/up-backend.c |  2 +-
 src/up-daemon.c        |  4 ++--
 src/up-device-list.c   | 10 +++++++---
 src/up-device-list.h   |  5 ++---
 src/up-self-test.c     |  6 +++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
index f15164d..80bb147 100644
--- a/src/linux/up-backend.c
+++ b/src/linux/up-backend.c
@@ -179,7 +179,7 @@ up_backend_device_new (UpBackend *backend, GUdevDevice *native)
 
 			/* not a power device, add it to the managed devices
 			 * and don't return a power device */
-			up_device_list_insert (backend->priv->managed_devices, G_OBJECT (native), G_OBJECT (input));
+			up_device_list_insert (backend->priv->managed_devices, input);
 			device = NULL;
 		}
 		g_object_unref (input);
diff --git a/src/up-daemon.c b/src/up-daemon.c
index 2d38164..065d562 100644
--- a/src/up-daemon.c
+++ b/src/up-daemon.c
@@ -1032,7 +1032,7 @@ up_daemon_device_added_cb (UpBackend *backend, UpDevice *device, UpDaemon *daemo
 	g_return_if_fail (UP_IS_DEVICE (device));
 
 	/* add to device list */
-	up_device_list_insert (priv->power_devices, up_device_get_native (device), G_OBJECT (device));
+	up_device_list_insert (priv->power_devices, device);
 
 	/* connect, so we get changes */
 	g_signal_connect (device, "notify",
@@ -1064,7 +1064,7 @@ up_daemon_device_removed_cb (UpBackend *backend, UpDevice *device, UpDaemon *dae
 	g_return_if_fail (UP_IS_DEVICE (device));
 
 	/* remove from list */
-	up_device_list_remove (priv->power_devices, G_OBJECT(device));
+	up_device_list_remove (priv->power_devices, device);
 
 	/* emit */
 	object_path = up_device_get_object_path (device);
diff --git a/src/up-device-list.c b/src/up-device-list.c
index 5f3f0cd..d7250f5 100644
--- a/src/up-device-list.c
+++ b/src/up-device-list.c
@@ -27,6 +27,7 @@
 
 #include "up-native.h"
 #include "up-device-list.h"
+#include "up-device.h"
 
 static void	up_device_list_finalize	(GObject		*object);
 
@@ -71,14 +72,17 @@ up_device_list_lookup (UpDeviceList *list, GObject *native)
  * into a list of devices.
  **/
 gboolean
-up_device_list_insert (UpDeviceList *list, GObject *native, GObject *device)
+up_device_list_insert (UpDeviceList *list, gpointer device)
 {
+	GObject *native;
 	const gchar *native_path;
 
 	g_return_val_if_fail (UP_IS_DEVICE_LIST (list), FALSE);
-	g_return_val_if_fail (native != NULL, FALSE);
 	g_return_val_if_fail (device != NULL, FALSE);
 
+	native = up_device_get_native (UP_DEVICE (device));
+	g_return_val_if_fail (native != NULL, FALSE);
+
 	native_path = up_native_get_native_path (native);
 	if (native_path == NULL) {
 		g_warning ("failed to get native path");
@@ -108,7 +112,7 @@ up_device_list_remove_cb (gpointer key, gpointer value, gpointer user_data)
  * up_device_list_remove:
  **/
 gboolean
-up_device_list_remove (UpDeviceList *list, GObject *device)
+up_device_list_remove (UpDeviceList *list, gpointer device)
 {
 	g_return_val_if_fail (UP_IS_DEVICE_LIST (list), FALSE);
 	g_return_val_if_fail (device != NULL, FALSE);
diff --git a/src/up-device-list.h b/src/up-device-list.h
index d82b667..94eaa5a 100644
--- a/src/up-device-list.h
+++ b/src/up-device-list.h
@@ -56,10 +56,9 @@ UpDeviceList	*up_device_list_new			(void);
 GObject		*up_device_list_lookup			(UpDeviceList		*list,
 							 GObject		*native);
 gboolean	 up_device_list_insert			(UpDeviceList		*list,
-							 GObject		*native,
-							 GObject		*device);
+							 gpointer		 device);
 gboolean	 up_device_list_remove			(UpDeviceList		*list,
-							 GObject		*device);
+							 gpointer		 device);
 void		 up_device_list_clear			(UpDeviceList		*list,
 							 gboolean unref_it);
 GPtrArray	*up_device_list_get_array		(UpDeviceList		*list);
diff --git a/src/up-self-test.c b/src/up-self-test.c
index a374cfd..f60618f 100644
--- a/src/up-self-test.c
+++ b/src/up-self-test.c
@@ -88,7 +88,7 @@ up_test_device_list_func (void)
 {
 	UpDeviceList *list;
 	GObject *native;
-	GObject *device;
+	UpDevice *device;
 	GObject *found;
 	gboolean ret;
 
@@ -97,8 +97,8 @@ up_test_device_list_func (void)
 
 	/* add device */
 	native = g_object_new (G_TYPE_OBJECT, NULL);
-	device = g_object_new (G_TYPE_OBJECT, NULL);
-	ret = up_device_list_insert (list, native, device);
+	device = up_device_new (NULL, native);
+	ret = up_device_list_insert (list, device);
 	g_assert (ret);
 
 	/* find device */