Author: cazfi Date: Sun Apr 16 17:29:36 2017 New Revision: 35250 URL: http://svn.gna.org/viewcvs/freeciv?rev=35250&view=rev Log: Make freeciv-mp-gtk3x compatible with gtk+-3.90
See hrm Feature #649665 Modified: branches/S3_0/configure.ac branches/S3_0/tools/mpgui_gtk4.c Modified: branches/S3_0/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/configure.ac?rev=35250&r1=35249&r2=35250&view=diff ============================================================================== --- branches/S3_0/configure.ac (original) +++ branches/S3_0/configure.ac Sun Apr 16 17:29:36 2017 @@ -1107,10 +1107,10 @@ if test "x$req_fcmp_gtk3x" = "xyes" || test "x$modinst" = "xall" || test "x$modinst" = "xauto" ; then - PKG_CHECK_MODULES([GTK3X_MP], [gtk+-4.0 >= 3.89.0], + PKG_CHECK_MODULES([GTK3X_MP], [gtk+-4.0 >= 3.90.0], [ GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_90" - GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46" + GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_52" PKG_CHECK_MODULES([GTHREAD_GTK3X], [gthread-2.0], [ fcmp_gtk3x=yes Modified: branches/S3_0/tools/mpgui_gtk4.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/tools/mpgui_gtk4.c?rev=35250&r1=35249&r2=35250&view=diff ============================================================================== --- branches/S3_0/tools/mpgui_gtk4.c (original) +++ branches/S3_0/tools/mpgui_gtk4.c Sun Apr 16 17:29:36 2017 @@ -596,8 +596,7 @@ load_install_info_lists(&fcmp); - /* Process GTK arguments */ - gtk_init(&ui_options, &argv); + gtk_init(); toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -623,7 +622,7 @@ modinst_setup_widgets(toplevel); - gtk_widget_show_all(toplevel); + gtk_widget_show(toplevel); if (fcmp.autoinstall != NULL) { gui_download_modpack(fcmp.autoinstall); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits