From 0f3a211d35c57c6c909d245c4e49dec953af7227 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 27 Feb 2016 23:46:25 -0500
Subject: [PATCH] gtk-demo: Simplify ui files a bit

Strip unneeded IDs.
---
 demos/gtk-demo/application.ui   | 18 +++++++-------
 demos/gtk-demo/font-features.ui |  6 ++---
 demos/gtk-demo/main.ui          | 18 +++++++-------
 demos/gtk-demo/stack.ui         | 10 ++++----
 demos/gtk-demo/theming.ui       | 42 ++++++++++++++++-----------------
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index 871c6f8e19..1ff1b4b965 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -6,10 +6,10 @@
     <property name="default-height">200</property>
     <property name="icon-name">document-open</property>
     <child>
-      <object class="GtkGrid" id="grid">
+      <object class="GtkGrid">
         <property name="visible">1</property>
         <child>
-          <object class="GtkToolbar" id="toolbar">
+          <object class="GtkToolbar">
             <property name="visible">1</property>
             <property name="hexpand">1</property>
             <style>
@@ -22,19 +22,19 @@
               </object>
             </child>
             <child>
-              <object class="GtkToolButton" id="quit">
+              <object class="GtkToolButton">
                 <property name="visible">1</property>
                 <property name="icon-name">application-exit</property>
                 <property name="action-name">app.quit</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="sep">
+              <object class="GtkSeparatorToolItem">
                 <property name="visible">1</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton" id="logo">
+              <object class="GtkToolButton">
                 <property name="visible">1</property>
                 <property name="icon-name">applications-other</property>
                 <property name="action-name">win.logo</property>
@@ -61,9 +61,9 @@
               </object>
             </child>
             <child internal-child="action_area">
-              <object class="GtkBox" id="action_area">
+              <object class="GtkBox">
                 <child>
-                  <object class="GtkButton" id="button">
+                  <object class="GtkButton">
                     <property name="visible">1</property>
                     <property name="valign">center</property>
                     <property name="label" translatable="yes">_OK</property>
@@ -80,11 +80,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="sw">
+          <object class="GtkScrolledWindow">
             <property name="visible">1</property>
             <property name="shadow-type">in</property>
             <child>
-              <object class="GtkTextView" id="contents">
+              <object class="GtkTextView">
                 <property name="visible">1</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui
index a923913eca..3906b8c86b 100644
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -18,7 +18,7 @@
             <property name="tooltip-text">Reset</property>
             <signal name="clicked" handler="reset" swapped="no"/>
             <child>
-              <object class="GtkImage" id="image1">
+              <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="icon_name">view-refresh-symbolic</property>
               </object>
@@ -31,12 +31,12 @@
       <object class="GtkBox">
         <property name="visible">1</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkScrolledWindow">
             <property name="visible">1</property>
             <property name="can_focus">1</property>
             <property name="hscrollbar_policy">never</property>
             <child>
-              <object class="GtkViewport" id="viewport1">
+              <object class="GtkViewport">
                 <property name="visible">1</property>
                 <child>
                   <object class="GtkBox">
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index 67a1ae11ec..d3f10e1ffe 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -26,7 +26,7 @@
         <property name="visible">1</property>
         <property name="show-close-button">1</property>
         <child>
-          <object class="GtkButton" id="run_button">
+          <object class="GtkButton">
             <property name="visible">1</property>
             <property name="valign">center</property>
             <property name="can_focus">1</property>
@@ -35,7 +35,7 @@
               <class name="text-button"/>
             </style>
             <child>
-              <object class="GtkLabel" id="run_label">
+              <object class="GtkLabel">
                 <property name="visible">1</property>
                 <property name="label" translatable="yes">Run</property>
               </object>
@@ -45,13 +45,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="box1">
+      <object class="GtkBox">
         <property name="visible">1</property>
         <child>
           <object class="GtkFrame">
             <property name="visible">1</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow">
+              <object class="GtkScrolledWindow">
                 <property name="width_request">120</property>
                 <property name="visible">1</property>
                 <property name="can_focus">1</property>
@@ -69,9 +69,9 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                      <object class="GtkTreeViewColumn">
                         <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                          <object class="GtkCellRendererText"/>
                           <attributes>
                             <attribute name="style">4</attribute>
                             <attribute name="text">1</attribute>
@@ -98,7 +98,7 @@
             <property name="enable_popup">1</property>
             <property name="show_border">0</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
+              <object class="GtkScrolledWindow">
                 <property name="visible">1</property>
                 <property name="can_focus">1</property>
                 <child>
@@ -122,7 +122,7 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel">
                 <property name="visible">1</property>
                 <property name="label" translatable="yes">_Info</property>
                 <property name="use_underline">1</property>
@@ -155,7 +155,7 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel">
                 <property name="visible">1</property>
                 <property name="label" translatable="yes">Source</property>
               </object>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index ed67261eb5..1383f41312 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -4,10 +4,10 @@
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Stack</property>
     <child>
-      <object class="GtkGrid" id="grid1">
+      <object class="GtkGrid">
         <property name="visible">1</property>
         <child>
-          <object class="GtkStackSwitcher" id="switcher">
+          <object class="GtkStackSwitcher">
             <property name="visible">1</property>
             <property name="stack">stack</property>
             <property name="halign">center</property>
@@ -23,7 +23,7 @@
             <property name="can_focus">1</property>
             <property name="transition-type">crossfade</property>
             <child>
-              <object class="GtkImage" id="image1">
+              <object class="GtkImage">
                 <property name="visible">1</property>
                 <property name="margin-top">20</property>
                 <property name="margin-bottom">20</property>
@@ -35,7 +35,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="checkbutton1">
+              <object class="GtkCheckButton">
                 <property name="label" translatable="yes">Page 2</property>
                 <property name="visible">1</property>
                 <property name="can_focus">1</property>
@@ -49,7 +49,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinner" id="spinner1">
+              <object class="GtkSpinner">
                 <property name="visible">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index d3a6e21a6a..ee0414b036 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -4,7 +4,7 @@
     <property name="row-spacing">6</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkToolbar" id="toolbar1">
+      <object class="GtkToolbar">
         <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="show-arrow">0</property>
@@ -12,7 +12,7 @@
           <class name="primary-toolbar"/>
         </style>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton1">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -26,7 +26,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton2">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -41,7 +41,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton3">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -55,7 +55,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton5">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised</property>
@@ -71,7 +71,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton6">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="label" translatable="yes">Raised Active</property>
@@ -88,7 +88,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="toolbutton4">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -103,7 +103,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolItem" id="toolitementry">
+          <object class="GtkToolItem">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
@@ -118,7 +118,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolItem" id="toolitemswitch">
+          <object class="GtkToolItem">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <child>
@@ -132,7 +132,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="box1">
+      <object class="GtkBox">
         <property name="visible">1</property>
         <property name="valign">center</property>
         <property name="halign">center</property>
@@ -140,7 +140,7 @@
           <class name="linked"/>
         </style>
         <child>
-          <object class="GtkButton" id="button1">
+          <object class="GtkButton">
             <property name="label" translatable="yes">Hi, I am a button</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
@@ -150,8 +150,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="button2">
-            <property name="label" translatable="yes">And I&apos;m another button</property>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">And I'm another button</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="can_focus">1</property>
@@ -163,7 +163,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="button3">
+          <object class="GtkButton">
             <property name="label" translatable="yes">This is a button party!</property>
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
@@ -178,7 +178,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkToolbar" id="itoolbar1">
+      <object class="GtkToolbar">
         <property name="visible">1</property>
         <property name="hexpand">1</property>
         <property name="icon_size">1</property>
@@ -186,7 +186,7 @@
           <class name="inline-toolbar"/>
         </style>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton1">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -199,7 +199,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton2">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -212,7 +212,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton3">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -226,7 +226,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton4">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="use_action_appearance">0</property>
@@ -240,7 +240,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton5">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>
@@ -254,7 +254,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToggleToolButton" id="itoolbutton6">
+          <object class="GtkToggleToolButton">
             <property name="use_action_appearance">0</property>
             <property name="visible">1</property>
             <property name="sensitive">0</property>