diff --git a/ChangeLog b/ChangeLog index 7d98b90e0e..05dab03208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-21 Matthias Clasen + + * gtk/gtk.symbols: mark gtk_socket_steal as deprecated. + + * configure.in: Bump the cairo requirement. + 2005-07-19 Owen Taylor * gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7d98b90e0e..05dab03208 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-07-21 Matthias Clasen + + * gtk/gtk.symbols: mark gtk_socket_steal as deprecated. + + * configure.in: Bump the cairo requirement. + 2005-07-19 Owen Taylor * gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7d98b90e0e..05dab03208 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-07-21 Matthias Clasen + + * gtk/gtk.symbols: mark gtk_socket_steal as deprecated. + + * configure.in: Bump the cairo requirement. + 2005-07-19 Owen Taylor * gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for diff --git a/configure.in b/configure.in index c87b44a1e0..2653e121bf 100644 --- a/configure.in +++ b/configure.in @@ -34,7 +34,7 @@ m4_define([gtk_binary_version], [2.4.0]) m4_define([glib_required_version], [2.7.1]) m4_define([pango_required_version], [1.9.0]) m4_define([atk_required_version], [1.0.1]) -m4_define([cairo_required_version], [0.5.1-head]) +m4_define([cairo_required_version], [0.5.2-head]) AC_INIT([gtk+], [gtk_version], diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index b3e8727892..03c7439db3 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2680,9 +2680,11 @@ gtk_socket_add_id gtk_socket_get_id gtk_socket_get_type G_GNUC_CONST gtk_socket_new +#ifndef GTK_DISABLE_DEPRECATED gtk_socket_steal #endif #endif +#endif #if IN_HEADER(__GTK_SPIN_BUTTON_H__) #if IN_FILE(__GTK_SPIN_BUTTON_C__)