From 4b081dea6c95e93ea1084bfed39409974d26f70b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 15 Aug 2024 02:06:43 +0200
Subject: [PATCH] Look up grouped devices through libwacom API too

Resolves: RHEL-17712
---
 ...Group-devices-using-libwacom-API-too.patch | 65 +++++++++++++++++++
 gnome-control-center.spec                     |  7 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 0001-wacom-Group-devices-using-libwacom-API-too.patch

diff --git a/0001-wacom-Group-devices-using-libwacom-API-too.patch b/0001-wacom-Group-devices-using-libwacom-API-too.patch
new file mode 100644
index 0000000..5456c8e
--- /dev/null
+++ b/0001-wacom-Group-devices-using-libwacom-API-too.patch
@@ -0,0 +1,65 @@
+From 482c317e2bfd17297c886acd99317436926a210d Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 15 Aug 2024 02:03:23 +0200
+Subject: [PATCH] wacom: Group devices using libwacom API too
+
+---
+ panels/wacom/cc-wacom-device.c | 7 +++++++
+ panels/wacom/cc-wacom-device.h | 4 ++++
+ panels/wacom/cc-wacom-page.c   | 9 +++++----
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/panels/wacom/cc-wacom-device.c b/panels/wacom/cc-wacom-device.c
+index a273393..cd3be0a 100644
+--- a/panels/wacom/cc-wacom-device.c
++++ b/panels/wacom/cc-wacom-device.c
+@@ -406,3 +406,10 @@ cc_wacom_device_get_button_settings (CcWacomDevice *device,
+ 
+ 	return settings;
+ }
++
++gboolean
++cc_wacom_device_is_grouped (CcWacomDevice *device1,
++                            CcWacomDevice *device2)
++{
++	return libwacom_compare (device1->wdevice, device2->wdevice, WCOMPARE_NORMAL) == 0;
++}
+diff --git a/panels/wacom/cc-wacom-device.h b/panels/wacom/cc-wacom-device.h
+index fae504a..18c5df0 100644
+--- a/panels/wacom/cc-wacom-device.h
++++ b/panels/wacom/cc-wacom-device.h
+@@ -61,3 +61,7 @@ guint           cc_wacom_device_get_num_buttons (CcWacomDevice *wacom_device);
+ 
+ GSettings     * cc_wacom_device_get_button_settings (CcWacomDevice *device,
+ 						     guint          button);
++
++gboolean        cc_wacom_device_is_grouped (CcWacomDevice *device1,
++                                            CcWacomDevice *device2);
++
+diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
+index b85bce7..25041c4 100644
+--- a/panels/wacom/cc-wacom-page.c
++++ b/panels/wacom/cc-wacom-page.c
+@@ -918,14 +918,15 @@ check_add_pad (CcWacomPage *page,
+ 	if ((gsd_device_get_device_type (gsd_device) & GSD_DEVICE_TYPE_PAD) == 0)
+ 		return;
+ 
+-	if (!gsd_device_shares_group (cc_wacom_device_get_device (page->stylus),
+-				      gsd_device))
+-		return;
+-
+ 	wacom_device = cc_wacom_device_new (gsd_device);
+ 	if (!wacom_device)
+ 		return;
+ 
++	if (!cc_wacom_device_is_grouped (page->stylus, wacom_device) &&
++            !gsd_device_shares_group (cc_wacom_device_get_device (page->stylus),
++                                      gsd_device))
++                return;
++
+ 	page->pads = g_list_prepend (page->pads, g_steal_pointer (&wacom_device));
+ 	update_pad_availability (page);
+ }
+-- 
+2.46.0
+
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 21dbe70..9c79825 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -14,7 +14,7 @@
 
 Name:           gnome-control-center
 Version:        40.0
-Release:        32%{?dist}
+Release:        33%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -58,6 +58,7 @@ Patch15:        0001-wacom-Provide-connector-name-for-disambiguation.patch
 # https://issues.redhat.com/browse/RHEL-45317
 Patch16:        background-solid-colors.patch
 
+Patch17:        0001-wacom-Group-devices-using-libwacom-API-too.patch
 
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
@@ -248,6 +249,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Fri Dec 13 2024 Carlos Garnacho <cgarnach@redhat.com> - 40.0-33
+- Look up grouped devices through libwacom API too
+  Resolves: RHEL-17712
+
 * Fri Aug 30 2024 Felipe Borges <feborges@redhat.com> - 40.0-32
 - Reintroduce solid color wallpapers
   Resolves: RHEL-45317