[rhythmbox] fix up some button definitions so the button-images setting works (bug #592763)

[Jonathan Matthew <jmatthew src gnome org>]

commit 13133c6a943e982da82253593b4e364141a1b905
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Sep 17 06:44:00 2009 +1000

    fix up some button definitions so the button-images setting works (bug #592763)

 data/ui/library-prefs.ui |   43 +++++++------------------------------------
 data/ui/plugins.ui       |   43 +++++++------------------------------------
 2 files changed, 14 insertions(+), 72 deletions(-)
---
diff --git a/data/ui/library-prefs.ui b/data/ui/library-prefs.ui
index 2f61141..57d0ddf 100644
--- a/data/ui/library-prefs.ui
+++ b/data/ui/library-prefs.ui
@@ -2,6 +2,10 @@
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="edit_button_image">
+    <property name="stock">gtk-edit</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkVBox" id="library_vbox">
     <property name="visible">True</property>
     <property name="border_width">12</property>
@@ -305,42 +309,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment4">
-                            <property name="visible">True</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox19">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image2">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-edit</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label24">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Edit...</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="image">edit_button_image</property>
+                        <property name="label" translatable="yes">_Edit...</property>
+                        <property name="use_underline">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/data/ui/plugins.ui b/data/ui/plugins.ui
index 8cbbb19..b9603e9 100644
--- a/data/ui/plugins.ui
+++ b/data/ui/plugins.ui
@@ -2,6 +2,10 @@
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkImage" id="configure_button_image">
+    <property name="stock">gtk-preferences</property>
+    <property name="icon_size">4</property>
+  </object>
   <object class="GtkHBox" id="edit_plugins">
     <property name="visible">True</property>
     <property name="border_width">6</property>
@@ -237,42 +241,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-preferences</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">C_onfigure...</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="image">configure_button_image</property>
+                <property name="label" translatable="yes">C_onfigure...</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>