Author: cazfi
Date: Fri Mar 31 15:21:32 2017
New Revision: 35171
URL: http://svn.gna.org/viewcvs/freeciv?rev=35171&view=rev
Log:
Gtk3x-client identifies itself as one
See hrm Feature #637962
Modified:
trunk/client/gui-gtk-4.0/gui_main.c
trunk/client/gui-gtk-4.0/gui_main.h
Modified: trunk/client/gui-gtk-4.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/gui_main.c?rev=35171&r1=35170&r2=35171&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/gui_main.c (original)
+++ trunk/client/gui-gtk-4.0/gui_main.c Fri Mar 31 15:21:32 2017
@@ -101,7 +101,7 @@
#include "gui_main.h"
-const char *client_string = "gui-gtk-3.22";
+const char *client_string = "gui-gtk-3x";
GtkWidget *map_canvas; /* GtkDrawingArea */
GtkWidget *map_horizontal_scrollbar;
@@ -1672,15 +1672,15 @@
}
/**************************************************************************
- 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;
+ Migrate gtk3x client specific options from gtk3.22 client options.
+**************************************************************************/
+static void migrate_options_from_gtk3_22(void)
+{
+ log_normal(_("Migrating options from gtk3.22 to gtk3x client"));
+
+#define MIGRATE_OPTION(opt) GUI_GTK_OPTION(opt) =
gui_options.gui_gtk3_22_##opt;
#define MIGRATE_STR_OPTION(opt) \
- strncpy(GUI_GTK_OPTION(opt), gui_options.gui_gtk3_##opt, \
+ strncpy(GUI_GTK_OPTION(opt), gui_options.gui_gtk3_22_##opt, \
sizeof(GUI_GTK_OPTION(opt)));
/* Default theme name is never migrated */
@@ -1719,7 +1719,7 @@
#undef MIGRATE_OPTION
#undef MIGRATE_STR_OPTION
- GUI_GTK_OPTION(migrated_from_gtk3) = TRUE;
+ GUI_GTK_OPTION(migrated_from_gtk3_22) = TRUE;
}
/**************************************************************************
@@ -1754,8 +1754,8 @@
gtk_widget_set_name(toplevel, "Freeciv");
root_window = gtk_widget_get_window(toplevel);
- if (!GUI_GTK_OPTION(migrated_from_gtk3)) {
- migrate_options_from_gtk3();
+ if (!GUI_GTK_OPTION(migrated_from_gtk3_22)) {
+ migrate_options_from_gtk3_22();
}
if (GUI_GTK_OPTION(fullscreen)) {
@@ -1881,7 +1881,7 @@
**************************************************************************/
enum gui_type get_gui_type(void)
{
- return GUI_GTK3_22;
+ return GUI_GTK3x;
}
/**************************************************************************
Modified: trunk/client/gui-gtk-4.0/gui_main.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/gui_main.h?rev=35171&r1=35170&r2=35171&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/gui_main.h (original)
+++ trunk/client/gui-gtk-4.0/gui_main.h Fri Mar 31 15:21:32 2017
@@ -18,9 +18,9 @@
/* client */
#include "gui_main_g.h"
-#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
+#define GUI_GTK_OPTION(optname) gui_options.gui_gtk4_##optname
+#define GUI_GTK_OPTION_STR(optname) "gui_gtk4_" #optname
+#define GUI_GTK_DEFAULT_THEME_NAME FC_GTK4_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
