fixing the last merge

[xboard.git] / gtk-interface.xml

diff --git a/gtk-interface.xml b/gtk-interface.xml
index c1bb87f..8cebc13 100644 (file)
--- a/gtk-interface.xml
+++ b/gtk-interface.xml
@@ -32,7 +32,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkScrolledWindow" id="scrolledwindow-movehistory">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">automatic</property>
@@ -95,7 +95,7 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="CloseButton">
+              <object class="GtkButton" id="CloseButton-movehistory">
                 <property name="label" translatable="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -119,7 +119,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">CloseButton</action-widget>
+      <action-widget response="0">CloseButton-movehistory</action-widget>
     </action-widgets>
   </object>
   <object class="GtkWindow" id="MainWindow">
@@ -1388,7 +1388,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkScrolledWindow" id="scrolledwindow-gamelist">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">automatic</property>
@@ -1425,7 +1425,7 @@
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="LoadButton">
+              <object class="GtkButton" id="LoadButton-GameList">
                 <property name="label" translatable="yes">Load</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1438,7 +1438,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="PrevButton">
+              <object class="GtkButton" id="PrevButton-GameList">
                 <property name="label" translatable="yes">Prev</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1451,7 +1451,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="NextButton">
+              <object class="GtkButton" id="NextButton-GameList">
                 <property name="label" translatable="yes">Next</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1464,7 +1464,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="CloseButton">
+              <object class="GtkButton" id="CloseButton-GameList">
                 <property name="label" translatable="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -1487,10 +1487,10 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">LoadButton</action-widget>
-      <action-widget response="0">PrevButton</action-widget>
-      <action-widget response="0">NextButton</action-widget>
-      <action-widget response="0">CloseButton</action-widget>
+      <action-widget response="0">LoadButton-GameList</action-widget>
+      <action-widget response="0">PrevButton-GameList</action-widget>
+      <action-widget response="0">NextButton-GameList</action-widget>
+      <action-widget response="0">CloseButton-GameList</action-widget>
     </action-widgets>
   </object>
 </interface>