Author: cazfi Date: Tue May 2 14:11:04 2017 New Revision: 35363 URL: http://svn.gna.org/viewcvs/freeciv?rev=35363&view=rev Log: Add separate gtk4_menus.xml for gtk3x-client
See hrm Feature #656561 Added: trunk/data/gtk4_menus.xml - copied unchanged from r35362, trunk/data/gtk3.22_menus.xml Modified: trunk/client/gui-gtk-4.0/menu.c trunk/data/Makefile.am Modified: trunk/client/gui-gtk-4.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/menu.c?rev=35363&r1=35362&r2=35363&view=diff ============================================================================== --- trunk/client/gui-gtk-4.0/menu.c (original) +++ trunk/client/gui-gtk-4.0/menu.c Tue May 2 14:11:04 2017 @@ -1884,7 +1884,7 @@ const char *name; if ((name = getenv("FREECIV_MENUS")) - || (name = fileinfoname(get_data_dirs(), "gtk3.22_menus.xml"))) { + || (name = fileinfoname(get_data_dirs(), "gtk4_menus.xml"))) { sz_strlcpy(filename, name); } else { log_error("Gtk menus: file definition not found"); Modified: trunk/data/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/Makefile.am?rev=35363&r1=35362&r2=35363&view=diff ============================================================================== --- trunk/data/Makefile.am (original) +++ trunk/data/Makefile.am Tue May 2 14:11:04 2017 @@ -21,6 +21,9 @@ if CLIENT_GUI_GTK_3_22 CLIENT_FILES += \ gtk3.22_menus.xml +endif +if CLIENT_GUI_GTK_3X + gtk4_menus.xml endif else CLIENT_FILES = @@ -52,6 +55,7 @@ freeciv-client.png \ gtk3_menus.xml \ gtk3.22_menus.xml \ + gtk4_menus.xml \ amplio2.tilespec \ cimpletoon.tilespec \ hex2t.tilespec \ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits