From 2f492c133c23401adb6d7c3679b407c4ed1c021b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 30 Jun 2016 18:48:44 +0200
Subject: [PATCH] wayland: Fix label lookup on >1 strips/rings

We assumed that each group could only have 1 strip and/or ring, because
accounting is performed per group, so we could not assume the real
index for anything above 1. Get rid of this restriction, now that
MetaWaylandTabletPad does its own accounting of rings/strips, alongside
groups.
---
 src/wayland/meta-wayland-tablet-pad.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/wayland/meta-wayland-tablet-pad.c b/src/wayland/meta-wayland-tablet-pad.c
index 7c71fcece..6f5572949 100644
--- a/src/wayland/meta-wayland-tablet-pad.c
+++ b/src/wayland/meta-wayland-tablet-pad.c
@@ -588,28 +588,18 @@ meta_wayland_tablet_pad_get_label (MetaWaylandTabletPad *pad,
       break;
     case META_PAD_ACTION_RING:
       {
-        MetaWaylandTabletPadGroup *group;
         MetaWaylandTabletPadRing *ring;
 
-        /* FIXME: Assuming each group gets 1 */
-        group = g_list_nth_data (pad->groups, action);
-        if (!group)
-          break;
-        ring = g_list_nth_data (group->rings, 0);
+        ring = g_list_nth_data (pad->rings, action);
         if (ring)
           label = ring->feedback;
         break;
       }
     case META_PAD_ACTION_STRIP:
       {
-        MetaWaylandTabletPadGroup *group;
         MetaWaylandTabletPadStrip *strip;
 
-        /* FIXME: Assuming each group gets 1 */
-        group = g_list_nth_data (pad->groups, action);
-        if (!group)
-          break;
-        strip = g_list_nth_data (group->strips, 0);
+        strip = g_list_nth_data (pad->strips, action);
         if (strip)
           label = strip->feedback;
         break;