[gtk+/gtk-2-24] Deprecate gdk_xid_table* functions

[Matthias Clasen <matthiasc src gnome org>]

commit dd05e41475f02c85d5a33d412744a57e82334cd6
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Dec 21 08:00:35 2010 -0500

    Deprecate gdk_xid_table* functions

 gdk/x11/gdkx.h   |    5 +++--
 gdk/x11/gdkxid.c |    8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index f3ac394..bd8f49f 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -141,9 +141,10 @@ GdkColormap* gdkx_colormap_get (Colormap xcolormap);
 GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
 					   Colormap   xcolormap);
 
-     /* Return the Gdk* for a particular XID */
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION
 gpointer      gdk_xid_table_lookup_for_display (GdkDisplay *display,
 						XID         xid);
+#endif
 guint32       gdk_x11_get_server_time  (GdkWindow       *window);
 guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
@@ -165,8 +166,8 @@ XID      gdk_x11_screen_get_monitor_output   (GdkScreen *screen,
                                               gint       monitor_num);
 
 #ifndef GDK_MULTIHEAD_SAFE
-gpointer      gdk_xid_table_lookup   (XID              xid);
 #ifndef GDK_DISABLE_DEPRECATED
+gpointer      gdk_xid_table_lookup   (XID              xid);
 gboolean      gdk_net_wm_supports    (GdkAtom    property);
 #endif
 void          gdk_x11_grab_server    (void);
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index c53ee38..1005f9e 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -89,6 +89,10 @@ _gdk_xid_table_remove (GdkDisplay *display,
  *     with the X id.
  *
  * Since: 2.2
+ *
+ * Deprecated:2.24: This function will be removed in GTK+ 3.0. GTK+
+ *     only stores windows in its X id table nowadays, so use
+ *     gdk_x11_window_lookup_for_display() instead.
  */
 gpointer
 gdk_xid_table_lookup_for_display (GdkDisplay  *display,
@@ -118,6 +122,10 @@ gdk_xid_table_lookup_for_display (GdkDisplay  *display,
  * Return value: the associated Gdk object, which may be a #GdkPixmap,
  *     a #GdkWindow or a #GdkFont or %NULL if no object is associated
  *     with the X id.
+ *
+ * Deprecated:2.24: This function will be removed in GTK+ 3.0. GTK+
+ *     only stores windows in its X id table nowadays, so use
+ *     gdk_x11_window_lookup_for_display() instead.
  */
 gpointer
 gdk_xid_table_lookup (XID xid)