Author: cazfi
Date: Sat Nov 7 18:16:19 2015
New Revision: 30471
URL: http://svn.gna.org/viewcvs/freeciv?rev=30471&view=rev
Log:
Lookup options in gtk3-client options_extra_init() by their correct name.
See bug #24032
Modified:
trunk/client/gui-gtk-3.0/gui_main.c
trunk/client/gui-gtk-3.0/gui_main.h
Modified: trunk/client/gui-gtk-3.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=30471&r1=30470&r2=30471&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.c (original)
+++ trunk/client/gui-gtk-3.0/gui_main.c Sat Nov 7 18:16:19 2015
@@ -2159,20 +2159,20 @@
struct option *poption;
#define option_var_set_callback(var, callback) \
- if ((poption = optset_option_by_name(client_optset, #var))) { \
+ if ((poption = optset_option_by_name(client_optset,
GUI_GTK_OPTION_STR(var)))) { \
option_set_changed_callback(poption, callback); \
} else { \
- log_error("Didn't find option %s!", #var); \
- }
-
- option_var_set_callback(GUI_GTK_OPTION(allied_chat_only),
+ log_error("Didn't find option %s!", GUI_GTK_OPTION_STR(var)); \
+ }
+
+ option_var_set_callback(allied_chat_only,
allied_chat_only_callback);
- option_var_set_callback(GUI_GTK_OPTION(font_city_names),
+ option_var_set_callback(font_city_names,
apply_city_names_font);
- option_var_set_callback(GUI_GTK_OPTION(font_city_productions),
+ option_var_set_callback(font_city_productions,
apply_city_productions_font);
- option_var_set_callback(GUI_GTK_OPTION(font_reqtree_text),
+ option_var_set_callback(font_reqtree_text,
apply_reqtree_text_font);
#undef option_var_set_callback
}
Modified: trunk/client/gui-gtk-3.0/gui_main.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.h?rev=30471&r1=30470&r2=30471&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.h (original)
+++ trunk/client/gui-gtk-3.0/gui_main.h Sat Nov 7 18:16:19 2015
@@ -22,6 +22,7 @@
#include "gtkpixcomm.h"
#define GUI_GTK_OPTION(optname) gui_options.gui_gtk3_##optname
+#define GUI_GTK_OPTION_STR(optname) "gui_gtk3_" #optname
/* network string charset conversion */
gchar *ntoh_str(const gchar *netstr);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
