From 0047261f23b44f56d5046b2fe392a7d4c57f1db9 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Wed, 21 Nov 2018 11:59:15 +0200
Subject: [PATCH] rename more objects in the quest to get rid of duplicate IDs

Continuing from the previous patch, this patch renames more objects in
pavucontrol.glade to get rid of duplicate IDs. nameLabel and iconImage
actually weren't any more duplicates, because the previous patch renamed
the corresponding IDs for devices and streams, but the card related
objects were renamed nevertheless to be more descriptive and consistent
with the IDs used by the device and stream widgets.
---
 src/cardwidget.cc     |  4 ++--
 src/devicewidget.cc   |  4 ++--
 src/pavucontrol.glade | 12 ++++++------
 src/streamwidget.cc   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cardwidget.cc b/src/cardwidget.cc
index 28c558d..bcd53fa 100644
--- a/src/cardwidget.cc
+++ b/src/cardwidget.cc
@@ -30,9 +30,9 @@
 CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) :
     Gtk::VBox(cobject) {
 
-    x->get_widget("nameLabel", nameLabel);
+    x->get_widget("cardNameLabel", nameLabel);
     x->get_widget("profileList", profileList);
-    x->get_widget("iconImage", iconImage);
+    x->get_widget("cardIconImage", iconImage);
 
     treeModel = Gtk::ListStore::create(profileModel);
     profileList->set_model(treeModel);
diff --git a/src/devicewidget.cc b/src/devicewidget.cc
index b4cf9dd..ce9850f 100644
--- a/src/devicewidget.cc
+++ b/src/devicewidget.cc
@@ -41,8 +41,8 @@ DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
     x->get_widget("deviceBoldNameLabel", boldNameLabel);
     x->get_widget("deviceIconImage", iconImage);
 
-    x->get_widget("lockToggleButton", lockToggleButton);
-    x->get_widget("muteToggleButton", muteToggleButton);
+    x->get_widget("deviceLockToggleButton", lockToggleButton);
+    x->get_widget("deviceMuteToggleButton", muteToggleButton);
     x->get_widget("defaultToggleButton", defaultToggleButton);
     x->get_widget("portSelect", portSelect);
     x->get_widget("portList", portList);
diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
index c8497a1..8a6a17e 100644
--- a/src/pavucontrol.glade
+++ b/src/pavucontrol.glade
@@ -92,7 +92,7 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
-                      <object class="GtkImage" id="iconImage">
+                      <object class="GtkImage" id="cardIconImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
@@ -109,7 +109,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="nameLabel">
+                          <object class="GtkLabel" id="cardNameLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
@@ -277,7 +277,7 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">3</property>
                         <child>
-                          <object class="GtkToggleButton" id="muteToggleButton">
+                          <object class="GtkToggleButton" id="deviceMuteToggleButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -299,7 +299,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="lockToggleButton">
+                          <object class="GtkToggleButton" id="deviceLockToggleButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -1524,7 +1524,7 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">3</property>
                         <child>
-                          <object class="GtkToggleButton" id="muteToggleButton">
+                          <object class="GtkToggleButton" id="streamMuteToggleButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
@@ -1546,7 +1546,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="lockToggleButton">
+                          <object class="GtkToggleButton" id="streamLockToggleButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
diff --git a/src/streamwidget.cc b/src/streamwidget.cc
index 1682a70..8aab675 100644
--- a/src/streamwidget.cc
+++ b/src/streamwidget.cc
@@ -39,8 +39,8 @@ StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
     x->get_widget("streamBoldNameLabel", boldNameLabel);
     x->get_widget("streamIconImage", iconImage);
 
-    x->get_widget("lockToggleButton", lockToggleButton);
-    x->get_widget("muteToggleButton", muteToggleButton);
+    x->get_widget("streamLockToggleButton", lockToggleButton);
+    x->get_widget("streamMuteToggleButton", muteToggleButton);
     x->get_widget("directionLabel", directionLabel);
     x->get_widget("deviceButton", deviceButton);