Author: cazfi
Date: Tue Oct 20 17:41:11 2015
New Revision: 30144
URL: http://svn.gna.org/viewcvs/freeciv?rev=30144&view=rev
Log:
Fixed setting up governments menu icons in gtk3-client.
Note that since version 3.10 gtk+ does not show such icons by default, even
when they are properly
set up, so in most cases this just stops gtk+ from spitting out warnings.
See bug #23944
Modified:
trunk/client/gui-gtk-3.0/menu.c
Modified: trunk/client/gui-gtk-3.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=30144&r1=30143&r2=30144&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Tue Oct 20 17:41:11 2015
@@ -2569,7 +2569,10 @@
g_object_set_data(G_OBJECT(item), "government", g);
if ((gsprite = get_government_sprite(tileset, g))) {
- image = gtk_pixcomm_new_from_sprite(gsprite);
+ GdkPixbuf *pb = sprite_get_pixbuf(gsprite);
+
+ image = gtk_image_new_from_pixbuf(pb);
+ g_object_unref(pb);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
gtk_widget_show(image);
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
