Author: cazfi
Date: Sun Oct 9 10:33:31 2016
New Revision: 34067
URL: http://svn.gna.org/viewcvs/freeciv?rev=34067&view=rev
Log:
Dropped setting migration from freeciv-2.5 of gtk3.22-client, as there
is no settings for that client to migrate in 2.5.
See patch #7768
Modified:
branches/S2_6/client/gui-gtk-3.22/gui_main.c
Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gui_main.c?rev=34067&r1=34066&r2=34067&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/gui_main.c Sun Oct 9 10:33:31 2016
@@ -1701,20 +1701,6 @@
}
/**************************************************************************
- Migrate gtk3 client specific options from freeciv-2.5 options
-**************************************************************************/
-static void migrate_options_from_2_5(void)
-{
- if (!gui_options.first_boot) {
- log_normal(_("Migrating gtk3-client options from freeciv-2.5 options."));
-
- GUI_GTK_OPTION(fullscreen) = gui_options.migrate_fullscreen;
-
- GUI_GTK_OPTION(migrated_from_2_5) = TRUE;
- }
-}
-
-/**************************************************************************
Called from client_main(), is what it's named.
**************************************************************************/
void ui_main(int argc, char **argv)
@@ -1746,9 +1732,6 @@
if (!GUI_GTK_OPTION(migrated_from_gtk2)) {
migrate_options_from_gtk2();
- }
- if (!GUI_GTK_OPTION(migrated_from_2_5)) {
- migrate_options_from_2_5();
}
if (GUI_GTK_OPTION(fullscreen)) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
