Author: cazfi Date: Mon Oct 10 05:47:43 2016 New Revision: 34080 URL: http://svn.gna.org/viewcvs/freeciv?rev=34080&view=rev Log: Made gtk3.22-client to identify itself correctly.
See patch #7769 Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.c branches/S2_6/client/gui-gtk-3.22/gui_main.h 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=34080&r1=34079&r2=34080&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 Mon Oct 10 05:47:43 2016 @@ -105,7 +105,7 @@ #include "gui_main.h" -const char *client_string = "gui-gtk-3.0"; +const char *client_string = "gui-gtk-3.22"; GtkWidget *map_canvas; /* GtkDrawingArea */ GtkWidget *map_horizontal_scrollbar; @@ -1649,20 +1649,19 @@ } /************************************************************************** - Migrate gtk3 client specific options from gtk2 client options. -**************************************************************************/ -static void migrate_options_from_gtk2(void) -{ - log_normal(_("Migrating options from gtk2 to gtk3 client")); - -#define MIGRATE_OPTION(opt) GUI_GTK_OPTION(opt) = gui_options.gui_gtk2_##opt; + Migrate gtk3.22 client specific options from gtk3 client options. +**************************************************************************/ +static void migrate_options_from_gtk3(void) +{ + log_normal(_("Migrating options from gtk3 to gtk3.22 client")); + +#define MIGRATE_OPTION(opt) GUI_GTK_OPTION(opt) = gui_options.gui_gtk3_##opt; #define MIGRATE_STR_OPTION(opt) \ - strncpy(GUI_GTK_OPTION(opt), gui_options.gui_gtk2_##opt, \ + strncpy(GUI_GTK_OPTION(opt), gui_options.gui_gtk3_##opt, \ sizeof(GUI_GTK_OPTION(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(fullscreen); MIGRATE_OPTION(map_scrollbars); MIGRATE_OPTION(dialogs_on_top); MIGRATE_OPTION(show_task_icons); @@ -1697,7 +1696,7 @@ #undef MIGRATE_OPTION #undef MIGRATE_STR_OPTION - GUI_GTK_OPTION(migrated_from_gtk2) = TRUE; + GUI_GTK_OPTION(migrated_from_gtk3) = TRUE; } /************************************************************************** @@ -1730,8 +1729,8 @@ gtk_widget_set_name(toplevel, "Freeciv"); root_window = gtk_widget_get_window(toplevel); - if (!GUI_GTK_OPTION(migrated_from_gtk2)) { - migrate_options_from_gtk2(); + if (!GUI_GTK_OPTION(migrated_from_gtk3)) { + migrate_options_from_gtk3(); } if (GUI_GTK_OPTION(fullscreen)) { @@ -1857,7 +1856,7 @@ **************************************************************************/ enum gui_type get_gui_type(void) { - return GUI_GTK3; + return GUI_GTK3_22; } /************************************************************************** Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gui_main.h?rev=34080&r1=34079&r2=34080&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.22/gui_main.h (original) +++ branches/S2_6/client/gui-gtk-3.22/gui_main.h Mon Oct 10 05:47:43 2016 @@ -18,9 +18,9 @@ /* client */ #include "gui_main_g.h" -#define GUI_GTK_OPTION(optname) gui_options.gui_gtk3_##optname -#define GUI_GTK_OPTION_STR(optname) "gui_gtk3_" #optname -#define GUI_GTK_DEFAULT_THEME_NAME FC_GTK3_DEFAULT_THEME_NAME +#define GUI_GTK_OPTION(optname) gui_options.gui_gtk3_22_##optname +#define GUI_GTK_OPTION_STR(optname) "gui_gtk3_22_" #optname +#define GUI_GTK_DEFAULT_THEME_NAME FC_GTK3_22_DEFAULT_THEME_NAME /* 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