Author: cazfi
Date: Wed Sep 9 18:03:13 2015
New Revision: 29836
URL: http://svn.gna.org/viewcvs/freeciv?rev=29836&view=rev
Log:
Handle 'popup_tech_help' option when migrating options from gtk2-client to
gtk3-client
when started first time.
See bug #23859
Modified:
trunk/client/gui-gtk-3.0/gui_main.c
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=29836&r1=29835&r2=29836&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.c (original)
+++ trunk/client/gui-gtk-3.0/gui_main.c Wed Sep 9 18:03:13 2015
@@ -1551,6 +1551,8 @@
strncpy(options.gui_gtk3_##opt, options.gui_gtk2_##opt,
sizeof(options.gui_gtk3_##opt));
/* Default theme name is never migrated */
+ /* Fullscreen not migrated as gtk3-client differs from gtk2-client in a way
that
+ * user is likely to want default even if gtk2-client setting differs. */
MIGRATE_OPTION(map_scrollbars);
MIGRATE_OPTION(dialogs_on_top);
MIGRATE_OPTION(show_task_icons);
@@ -1567,6 +1569,7 @@
MIGRATE_OPTION(chatline_autocompletion);
MIGRATE_OPTION(citydlg_xsize);
MIGRATE_OPTION(citydlg_ysize);
+ MIGRATE_OPTION(popup_tech_help);
MIGRATE_STR_OPTION(font_city_label);
MIGRATE_STR_OPTION(font_notify_label);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
