rpms/totem/devel button-images.patch, NONE, 1.1 totem.spec, 1.250, 1.251

[Matthias Clasen]

Author: mclasen

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

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


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

--- NEW FILE button-images.patch ---
--- totem-2.27.2/data/plugins.ui	2009-04-17 08:56:43.000000000 -0400
+++ hacked/data/plugins.ui	2009-08-22 20:03:01.281431488 -0400
@@ -3,6 +3,10 @@
   SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
 <interface>
 
+<object class="GtkImage" id="configure_button_image">
+  <property name="stock">gtk-preferences</property>
+  <property name="icon_size">4</property>
+</object>
 <object class="GtkVBox" id="plugins_vbox">
   <property name="visible">True</property>
   <property name="homogeneous">False</property>
@@ -378,71 +382,10 @@
     	      <property name="can_focus">True</property>
     	      <property name="relief">GTK_RELIEF_NORMAL</property>
     	      <property name="focus_on_click">True</property>
+    	      <property name="image">configure_button_image</property>
+              <property name="label" translatable="yes">C_onfigure...</property>
+              <property name="use_underline">True</property>
     	      <signal name="clicked" handler="configure_button_cb"/>
-
-    	      <child>
-    		<object class="GtkAlignment" id="alignment1">
-    		  <property name="visible">True</property>
-    		  <property name="xalign">0.5</property>
-    		  <property name="yalign">0.5</property>
-    		  <property name="xscale">0</property>
-    		  <property name="yscale">0</property>
-    		  <property name="top_padding">0</property>
-    		  <property name="bottom_padding">0</property>
-    		  <property name="left_padding">0</property>
-    		  <property name="right_padding">0</property>
-
-    		  <child>
-    		    <object class="GtkHBox" id="hbox2">
-    		      <property name="visible">True</property>
-    		      <property name="homogeneous">False</property>
-    		      <property name="spacing">2</property>
-
-    		      <child>
-    			<object class="GtkImage" id="image1">
-    			  <property name="visible">True</property>
-    			  <property name="stock">gtk-preferences</property>
-    			  <property name="icon_size">4</property>
-    			  <property name="xalign">0.5</property>
-    			  <property name="yalign">0.5</property>
-    			  <property name="xpad">0</property>
-    			  <property name="ypad">0</property>
-    			</object>
-    			<packing>
-    			  <property name="padding">0</property>
-    			  <property name="expand">False</property>
-    			  <property name="fill">False</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>
-    			  <property name="use_markup">False</property>
-    			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-    			  <property name="wrap">False</property>
-    			  <property name="selectable">False</property>
-    			  <property name="xalign">0.5</property>
-    			  <property name="yalign">0.5</property>
-    			  <property name="xpad">0</property>
-    			  <property name="ypad">0</property>
-    			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-    			  <property name="width_chars">-1</property>
-    			  <property name="single_line_mode">False</property>
-    			  <property name="angle">0</property>
-    			</object>
-    			<packing>
-    			  <property name="padding">0</property>
-    			  <property name="expand">False</property>
-    			  <property name="fill">False</property>
-    			</packing>
-    		      </child>
-    		    </object>
-    		  </child>
-    		</object>
-    	      </child>
     	    </object>
     	    <packing>
     	      <property name="padding">0</property>


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- totem.spec	21 Aug 2009 16:13:05 -0000	1.250
+++ totem.spec	23 Aug 2009 00:12:03 -0000	1.251
@@ -6,13 +6,16 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.27.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.27/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=592760
+Patch0: button-images.patch
+
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 Requires(post): GConf2 >= 2.14
@@ -181,6 +184,7 @@ audio and video files in the properties 
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-images
 
 %build
 
@@ -193,7 +197,8 @@ export MOZILLA_PLUGINDIR=%{_libdir}/mozi
   --enable-mozilla \
   --enable-nautilus \
   --disable-scrollkeeper \
-  --disable-nvtv
+  --disable-nvtv \
+  --disable-vala
 
 make %{?_smp_mflags}
 
@@ -376,6 +381,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-6
+- Respect the button-images setting better
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.27.2-5
 - rebuilt with new openssl