Author: cazfi Date: Tue Oct 20 17:41:23 2015 New Revision: 30146 URL: http://svn.gna.org/viewcvs/freeciv?rev=30146&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: branches/S2_5/client/gui-gtk-3.0/menu.c Modified: branches/S2_5/client/gui-gtk-3.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/menu.c?rev=30146&r1=30145&r2=30146&view=diff ============================================================================== --- branches/S2_5/client/gui-gtk-3.0/menu.c (original) +++ branches/S2_5/client/gui-gtk-3.0/menu.c Tue Oct 20 17:41:23 2015 @@ -2428,7 +2428,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