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