rpms/rhythmbox/devel button-images.patch, NONE, 1.1 rhythmbox.spec, 1.257, 1.258

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16594

Modified Files:
	rhythmbox.spec 
Added Files:
	button-images.patch 
Log Message:
Respect button-images better


button-images.patch:
 plugins.ui |   43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

--- NEW FILE button-images.patch ---
diff -up rhythmbox-0.12.3/data/ui/plugins.ui.button-images rhythmbox-0.12.3/data/ui/plugins.ui
--- rhythmbox-0.12.3/data/ui/plugins.ui.button-images	2009-08-22 20:35:33.773436149 -0400
+++ rhythmbox-0.12.3/data/ui/plugins.ui	2009-08-22 20:38:07.670430227 -0400
@@ -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>


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- rhythmbox.spec	20 Aug 2009 03:15:46 -0000	1.257
+++ rhythmbox.spec	23 Aug 2009 00:45:38 -0000	1.258
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -50,6 +50,8 @@ ExcludeArch:    s390 s390x
 Patch0: 0001-Fix-audio-CD-activation.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592404
 Patch1: spinner.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=592763
+Patch2: button-images.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -84,6 +86,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 %patch0 -p1 -b .audiocd
 %patch1 -p1 -b .spinner
+%patch2 -p1 -b .button-images
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -221,6 +224,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-5
+- Respect the button-images setting better
+
 * Wed Aug 19 2009 Matthias Clasen <mclasen at redhat.com> - 0.12.3-4
 - Use the right spinner icon