Author: cazfi Date: Mon Oct 24 06:04:46 2016 New Revision: 34235 URL: http://svn.gna.org/viewcvs/freeciv?rev=34235&view=rev Log: Turned diplomacy dialog flags from GtkPixcomm to GtkImage in gtk3.22-client.
See bug #24573 Modified: branches/S2_6/client/gui-gtk-3.22/diplodlg.c Modified: branches/S2_6/client/gui-gtk-3.22/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/diplodlg.c?rev=34235&r1=34234&r2=34235&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.22/diplodlg.c (original) +++ branches/S2_6/client/gui-gtk-3.22/diplodlg.c Mon Oct 24 06:04:46 2016 @@ -627,7 +627,8 @@ GtkWidget *vbox, *hbox, *table, *mainbox; GtkWidget *label, *sw, *view, *image, *spin; GtkWidget *menubar, *menuitem, *menu, *notebook; - struct sprite *sprite; + struct sprite *flag_spr; + GdkPixbuf *pb; GtkListStore *store; GtkCellRenderer *rend; int i; @@ -709,9 +710,11 @@ gtk_container_add(GTK_CONTAINER(vbox), hbox); /* Our flag */ - sprite = get_nation_flag_sprite(tileset, nation_of_player(plr0)); - - image = gtk_pixcomm_new_from_sprite(sprite); + flag_spr = get_nation_flag_sprite(tileset, nation_of_player(plr0)); + + pb = sprite_get_pixbuf(flag_spr); + image = gtk_image_new_from_pixbuf(pb); + g_object_unref(pb); gtk_container_add(GTK_CONTAINER(hbox), image); /* Our name. */ @@ -791,9 +794,11 @@ gtk_container_add(GTK_CONTAINER(vbox), hbox); /* Their flag */ - sprite = get_nation_flag_sprite(tileset, nation_of_player(plr1)); - - image = gtk_pixcomm_new_from_sprite(sprite); + flag_spr = get_nation_flag_sprite(tileset, nation_of_player(plr1)); + + pb = sprite_get_pixbuf(flag_spr); + image = gtk_image_new_from_pixbuf(pb); + g_object_unref(pb); gtk_container_add(GTK_CONTAINER(hbox), image); /* Their name. */ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits