[gtk+/xi2-for-master] Deprecate gdk_display_list_devices().

[Carlos Garnacho <carlosg src gnome org>]

commit 31a3a80b40480b60308330d418514dce52750959
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri May 21 20:54:16 2010 +0200

    Deprecate gdk_display_list_devices().
    
    gdk_device_manager_list_devices() should be used instead.

 gdk/gdkdisplay.h         |    2 ++
 gdk/x11/gdkdisplay-x11.c |    2 ++
 gdk/x11/gdkinput.c       |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 1133dba..00c3684 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -213,7 +213,9 @@ void        gdk_display_flush              (GdkDisplay  *display);
 
 void	    gdk_display_close		   (GdkDisplay  *display);
 
+#ifndef GDK_DISABLE_DEPRECATED
 GList *     gdk_display_list_devices       (GdkDisplay  *display);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 GdkEvent* gdk_display_get_event  (GdkDisplay     *display);
 GdkEvent* gdk_display_peek_event (GdkDisplay     *display);
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 6544716..2ea95d5 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2493,6 +2493,8 @@ gdk_display_supports_composite (GdkDisplay *display)
  * Return value: a list of #GdkDevice
  *
  * Since: 2.2
+ *
+ * Deprecated: 3.0. Use gdk_device_manager_list_devices() instead.
  **/
 GList *
 gdk_display_list_devices (GdkDisplay *display)
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 2a83e3e..208d2c3 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -53,7 +53,7 @@ struct _GdkInputWindow
  *
  * Return value: a list of #GdkDevice
  *
- * Deprecated: 3.0. Use gdk_display_get_device_manager() instead.
+ * Deprecated: 3.0. Use gdk_device_manager_list_devices() instead.
  **/
 GList *
 gdk_devices_list (void)