Author: cazfi Date: Thu Nov 10 05:43:25 2016 New Revision: 34465 URL: http://svn.gna.org/viewcvs/freeciv?rev=34465&view=rev Log: Removed deprecated gtk_adjustment_value_changed() calls from gtk3.22-client.
See patch #6799 Modified: branches/S2_6/client/gui-gtk-3.22/citydlg.c branches/S2_6/client/gui-gtk-3.22/repodlgs.c branches/S2_6/m4/gtk3.22-client.m4 Modified: branches/S2_6/client/gui-gtk-3.22/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/citydlg.c?rev=34465&r1=34464&r2=34465&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.22/citydlg.c (original) +++ branches/S2_6/client/gui-gtk-3.22/citydlg.c Thu Nov 10 05:43:25 2016 @@ -444,7 +444,8 @@ /**************************************************************** Center city dialog map. *****************************************************************/ -static void city_dialog_map_recenter(GtkWidget *map_canvas_sw) { +static void city_dialog_map_recenter(GtkWidget *map_canvas_sw) +{ GtkAdjustment *adjust = NULL; gdouble value; @@ -456,7 +457,6 @@ + gtk_adjustment_get_upper(adjust) - gtk_adjustment_get_page_size(adjust)) / 2; gtk_adjustment_set_value(adjust, value); - gtk_adjustment_value_changed(adjust); adjust = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(map_canvas_sw)); @@ -464,7 +464,6 @@ + gtk_adjustment_get_upper(adjust) - gtk_adjustment_get_page_size(adjust)) / 2; gtk_adjustment_set_value(adjust, value); - gtk_adjustment_value_changed(adjust); } /**************************************************************** Modified: branches/S2_6/client/gui-gtk-3.22/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/repodlgs.c?rev=34465&r1=34464&r2=34465&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.22/repodlgs.c (original) +++ branches/S2_6/client/gui-gtk-3.22/repodlgs.c Thu Nov 10 05:43:25 2016 @@ -330,14 +330,12 @@ + gtk_adjustment_get_upper(adjust) - gtk_adjustment_get_page_size(adjust)) / width * x; gtk_adjustment_set_value(adjust, value); - gtk_adjustment_value_changed(adjust); adjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)); value = (gtk_adjustment_get_lower(adjust) + gtk_adjustment_get_upper(adjust) - gtk_adjustment_get_page_size(adjust)) / height * y; gtk_adjustment_set_value(adjust, value); - gtk_adjustment_value_changed(adjust); } } Modified: branches/S2_6/m4/gtk3.22-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/gtk3.22-client.m4?rev=34465&r1=34464&r2=34465&view=diff ============================================================================== --- branches/S2_6/m4/gtk3.22-client.m4 (original) +++ branches/S2_6/m4/gtk3.22-client.m4 Thu Nov 10 05:43:25 2016 @@ -10,8 +10,8 @@ test "x$client" = "xall" ; then PKG_CHECK_MODULES([GTK3_22], [gtk+-3.0 >= 3.22.0], [ - GTK3_22_CFLAGS="$GTK3_22_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_16" - GTK3_22_CFLAGS="$GTK3_22_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44" + GTK3_22_CFLAGS="$GTK3_22_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_18" + GTK3_22_CFLAGS="$GTK3_22_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46" gui_gtk3_22=yes if test "x$client" = "xauto" ; then client=yes _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits