Author: cazfi
Date: Sun Oct 16 12:51:45 2016
New Revision: 34152
URL: http://svn.gna.org/viewcvs/freeciv?rev=34152&view=rev
Log:
Added GUI_GTK3_22 definition.
See patch #7759
Modified:
trunk/client/tilespec.c
trunk/common/fc_types.h
trunk/fc_version
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=34152&r1=34151&r2=34152&view=diff
==============================================================================
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Sun Oct 16 12:51:45 2016
@@ -6408,6 +6408,7 @@
default_theme_name_sz = sizeof(gui_options.gui_gtk2_default_theme_name);
break;
case GUI_GTK3:
+ case GUI_GTK3_22:
default_theme_name = gui_options.gui_gtk3_default_theme_name;
default_theme_name_sz = sizeof(gui_options.gui_gtk3_default_theme_name);
break;
Modified: trunk/common/fc_types.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=34152&r1=34151&r2=34152&view=diff
==============================================================================
--- trunk/common/fc_types.h (original)
+++ trunk/common/fc_types.h Sun Oct 16 12:51:45 2016
@@ -520,18 +520,20 @@
#define SPECENUM_VALUE1NAME "gtk2"
#define SPECENUM_VALUE2 GUI_GTK3
#define SPECENUM_VALUE2NAME "gtk3"
+#define SPECENUM_VALUE3 GUI_GTK3_22
+#define SPECENUM_VALUE3NAME "gtk3.22"
/* GUI_SDL remains for now for keeping client options alive until
* user has migrated them to sdl2-client */
-#define SPECENUM_VALUE3 GUI_SDL
-#define SPECENUM_VALUE3NAME "sdl"
-#define SPECENUM_VALUE4 GUI_QT
-#define SPECENUM_VALUE4NAME "qt"
-#define SPECENUM_VALUE5 GUI_SDL2
-#define SPECENUM_VALUE5NAME "sdl2"
-#define SPECENUM_VALUE6 GUI_WEB
-#define SPECENUM_VALUE6NAME "web"
-#define SPECENUM_VALUE7 GUI_GTK3x
-#define SPECENUM_VALUE7NAME "gtk3x"
+#define SPECENUM_VALUE4 GUI_SDL
+#define SPECENUM_VALUE4NAME "sdl"
+#define SPECENUM_VALUE5 GUI_QT
+#define SPECENUM_VALUE5NAME "qt"
+#define SPECENUM_VALUE6 GUI_SDL2
+#define SPECENUM_VALUE6NAME "sdl2"
+#define SPECENUM_VALUE7 GUI_WEB
+#define SPECENUM_VALUE7NAME "web"
+#define SPECENUM_VALUE8 GUI_GTK3x
+#define SPECENUM_VALUE8NAME "gtk3x"
#include "specenum_gen.h"
/* Used in the network protocol. */
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=34152&r1=34151&r2=34152&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Sun Oct 16 12:51:45 2016
@@ -56,7 +56,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Oct.08"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Oct.16"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
