rpms/file-roller/F-12 button-images.patch, NONE, 1.1 file-roller.spec, 1.156, 1.157

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4064

Modified Files:
	file-roller.spec 
Added Files:
	button-images.patch 
Log Message:
Respect button-images setting


button-images.patch:
 gtk-utils.c |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

--- NEW FILE button-images.patch ---
--- file-roller-2.28.0/src/gtk-utils.c	2009-09-21 18:34:49.000000000 -0400
+++ hacked/src/gtk-utils.c	2009-10-01 20:49:18.728625160 -0400
@@ -164,8 +164,6 @@
 	gboolean      text_is_stock;
 	GtkStockItem  stock_item;
 
-	button = gtk_button_new ();
-
 	if (gtk_stock_lookup (text, &stock_item)) {
 		label_text = stock_item.label;
 		text_is_stock = TRUE;
@@ -178,19 +176,12 @@
 		image = gtk_image_new_from_stock (text, GTK_ICON_SIZE_BUTTON);
 	else
 		image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-	label = gtk_label_new_with_mnemonic (label_text);
-	hbox = gtk_hbox_new (FALSE, 2);
-	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	button = gtk_button_new_with_mnemonic (label_text);
+	gtk_button_set_image (GTK_BUTTON (button), image);
 
 	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-
-	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (button), align);
-	gtk_container_add (GTK_CONTAINER (align), hbox);
 
-	gtk_widget_show_all (button);
+	gtk_widget_show (button);
 
 	return button;
 }


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-12/file-roller.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- file-roller.spec	22 Sep 2009 00:51:25 -0000	1.156
+++ file-roller.spec	2 Oct 2009 00:58:13 -0000	1.157
@@ -11,12 +11,15 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.28.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
 Source:		http://download.gnome.org/sources/file-roller/2.28/file-roller-%{version}.tar.bz2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=597058
+Patch0: button-images.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -51,6 +54,7 @@ such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .button-images
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -127,6 +131,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Respect button-images setting
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0