Author: cazfi
Date: Tue Nov  3 00:30:52 2015
New Revision: 30379

URL: http://svn.gna.org/viewcvs/freeciv?rev=30379&view=rev
Log:
Use "gtk4" namespace for gtk3x client options.

See patch #6498

Modified:
    trunk/client/options.c
    trunk/client/options.h
    trunk/client/tilespec.c

Modified: trunk/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=30379&r1=30378&r2=30379&view=diff
==============================================================================
--- trunk/client/options.c      (original)
+++ trunk/client/options.c      Tue Nov  3 00:30:52 2015
@@ -246,7 +246,7 @@
   .gui_gtk3_font_reqtree_text = "Serif 10",
 
 /* gui-gtk-3.x client specific options. */
-  .gui_gtk3x_default_theme_name = FC_GTK3x_DEFAULT_THEME_NAME,
+  .gui_gtk4_default_theme_name = FC_GTK4_DEFAULT_THEME_NAME,
 
 /* gui-sdl client specific options. */
   .gui_sdl_default_theme_name = FC_SDL_DEFAULT_THEME_NAME,

Modified: trunk/client/options.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.h?rev=30379&r1=30378&r2=30379&view=diff
==============================================================================
--- trunk/client/options.h      (original)
+++ trunk/client/options.h      Tue Nov  3 00:30:52 2015
@@ -260,8 +260,8 @@
   char gui_gtk3_font_reqtree_text[512];
 
 /* gui-gtk-3-x client specific options. */
-#define FC_GTK3x_DEFAULT_THEME_NAME "Freeciv"
-  char gui_gtk3x_default_theme_name[512];
+#define FC_GTK4_DEFAULT_THEME_NAME "Freeciv"
+  char gui_gtk4_default_theme_name[512];
 
 /* gui-sdl client specific options. */
 #define FC_SDL_DEFAULT_THEME_NAME "human"

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=30379&r1=30378&r2=30379&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Tue Nov  3 00:30:52 2015
@@ -6111,8 +6111,8 @@
     default_theme_name_sz = sizeof(gui_options.gui_gtk3_default_theme_name);
     break;
   case GUI_GTK3x:
-    default_theme_name = gui_options.gui_gtk3x_default_theme_name;
-    default_theme_name_sz = sizeof(gui_options.gui_gtk3x_default_theme_name);
+    default_theme_name = gui_options.gui_gtk4_default_theme_name;
+    default_theme_name_sz = sizeof(gui_options.gui_gtk4_default_theme_name);
   case GUI_SDL:
     default_theme_name = gui_options.gui_sdl_default_theme_name;
     default_theme_name_sz = sizeof(gui_options.gui_sdl_default_theme_name);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to