mark gtk_socket_steal as deprecated.

2005-07-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtk.symbols: mark gtk_socket_steal as deprecated.

	* configure.in: Bump the cairo requirement.

diff --git a/ChangeLog b/ChangeLog
index 7d98b90e0e2ea3eb9ff26801bfaae08f506e377c..05dab0320883670e864ba4798b37b1f7fae053d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk.symbols: mark gtk_socket_steal as deprecated.
+
+       * configure.in: Bump the cairo requirement.
+
 2005-07-19  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7d98b90e0e2ea3eb9ff26801bfaae08f506e377c..05dab0320883670e864ba4798b37b1f7fae053d1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk.symbols: mark gtk_socket_steal as deprecated.
+
+       * configure.in: Bump the cairo requirement.
+
 2005-07-19  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7d98b90e0e2ea3eb9ff26801bfaae08f506e377c..05dab0320883670e864ba4798b37b1f7fae053d1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk.symbols: mark gtk_socket_steal as deprecated.
+
+       * configure.in: Bump the cairo requirement.
+
 2005-07-19  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for

diff --git a/configure.in b/configure.in
index c87b44a1e0ddbdcee285cf8bcec96c2ebf6c0088..2653e121bf7bc825888f2bbd89ee87db27ff1302 100644 (file)
--- 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 b3e8727892164a852ed2f9c594999090a392ab4c..03c7439db380ca1f8ecf41e3f62d7d0206ca9c1e 100644 (file)
--- 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__)