[file-roller] respect the button-images setting

[Paolo Bacchilega <paobac src gnome org>]

commit bd4e03924c6faf177efc9f462f35744f78d1256e
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Oct 2 09:56:26 2009 +0200

    respect the button-images setting
    
    [bug #597058]

 src/gtk-utils.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 8371fe3..47abc77 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -164,8 +164,6 @@ create_button (const char *stock_id,
 	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 @@ create_button (const char *stock_id,
 		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;
 }