Index: docs/reference/gdk/tmpl/x_interaction.sgml
===================================================================
--- docs/reference/gdk/tmpl/x_interaction.sgml	(Revision 21183)
+++ docs/reference/gdk/tmpl/x_interaction.sgml	(Arbeitskopie)
@@ -22,6 +22,7 @@ X backend-specific functions
 Obtains the Xlib window id of the root window of the current screen. 
 </para>
 
+Deprecated: 2.16: Use gdk_x11_display_get_xdisplay() instead.
 
 
 <!-- ##### MACRO GDK_ROOT_PARENT ##### -->
@@ -38,6 +39,8 @@ The current display.
 
 @Returns: an Xlib <type>Display*</type>.
 
+Deprecated: 2.16: Use gdk_display_get_default() instead.
+
 
 <!-- ##### MACRO GDK_WINDOW_XDISPLAY ##### -->
 <para>
Index: modules/other/gail/gailwindow.c
===================================================================
--- modules/other/gail/gailwindow.c	(Revision 21183)
+++ modules/other/gail/gailwindow.c	(Arbeitskopie)
@@ -655,6 +655,9 @@ get_window_desktop (Window window)
   int             error;
   int             result;
   int             desktop;
+  Display*        gdk_display;
+
+  gdk_display = gdk_x11_display_get_xdisplay (gdk_display_get_default());
 
   if (_net_wm_desktop == None)
     _net_wm_desktop =
@@ -709,6 +712,9 @@ get_stacked_windows (GailScreenInfo *inf
   int     j;
   int    *desktops;
   gboolean *desktops_changed;
+  Display* gdk_display;
+
+  gdk_display = gdk_x11_display_get_xdisplay (gdk_display_get_default());
 
   if (_net_client_list_stacking == None)
     _net_client_list_stacking =
@@ -908,11 +914,14 @@ init_gail_screen (GdkScreen *screen,
                   int        screen_n)
 {
   XWindowAttributes attrs;
+  Display* gdk_display;
 
   gail_screens [screen_n].root_window = gdk_screen_get_root_window (screen);
 
   get_stacked_windows (&gail_screens [screen_n]);
 
+  gdk_display = gdk_x11_display_get_xdisplay (gdk_display_get_default());
+
   XGetWindowAttributes (gdk_display,
 			GDK_WINDOW_XWINDOW (gail_screens [screen_n].root_window),
 			&attrs); 
Index: gdk/gdk.symbols
===================================================================
--- gdk/gdk.symbols	(Revision 21183)
+++ gdk/gdk.symbols	(Arbeitskopie)
@@ -874,9 +874,11 @@ gdk_visual_get_type G_GNUC_CONST
 
 #if IN_HEADER(__GDK_X_H__)
 #if IN_FILE(__GDK_EVENTS_X11_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_net_wm_supports
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_PANGO_H__)
 #if IN_FILE(__GDK_PANGO_C__)
@@ -1160,13 +1162,15 @@ gdk_win32_selection_add_targets
 #ifdef GDK_WINDOWING_X11
 #if IN_HEADER(__GDK_X_H__)
 #if IN_FILE(__GDK_PROPERTY_X11_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_x11_atom_to_xatom
-gdk_x11_atom_to_xatom_for_display
 gdk_x11_get_xatom_by_name
-gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
-gdk_x11_get_xatom_name_for_display
 gdk_x11_xatom_to_atom
+#endif
+gdk_x11_atom_to_xatom_for_display
+gdk_x11_get_xatom_by_name_for_display
+gdk_x11_get_xatom_name_for_display
 gdk_x11_xatom_to_atom_for_display
 #endif
 
@@ -1214,12 +1218,14 @@ gdk_x11_gc_get_xgc
 #endif
 
 #if IN_FILE(__GDK_MAIN_X11_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
 gdk_x11_ungrab_server
 #endif
+#endif
 
 #if IN_FILE(__GDK_EVENTS_X11_C__)
 gdk_x11_get_server_time
@@ -1251,7 +1257,9 @@ gdk_x11_window_move_to_current_desktop
 #endif
 
 #if IN_FILE(__GDK_XID_C__)
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_xid_table_lookup
+#endif
 gdk_xid_table_lookup_for_display
 #endif
 #endif
Index: gdk/x11/gdkx.h
===================================================================
--- gdk/x11/gdkx.h	(Revision 21183)
+++ gdk/x11/gdkx.h	(Arbeitskopie)
@@ -35,8 +35,10 @@
 G_BEGIN_DECLS
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 extern Display          *gdk_display;
 #endif
+#endif
 
 Display *gdk_x11_drawable_get_xdisplay    (GdkDrawable *drawable);
 XID      gdk_x11_drawable_get_xid         (GdkDrawable *drawable);
@@ -59,10 +61,12 @@ void     gdk_x11_window_move_to_current_
 const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 Window   gdk_x11_get_default_root_xwindow (void);
 Display *gdk_x11_get_default_xdisplay     (void);
 gint     gdk_x11_get_default_screen       (void);
 #endif
+#endif
 
 #define GDK_COLORMAP_XDISPLAY(cmap)   (gdk_x11_colormap_get_xdisplay (cmap))
 #define GDK_COLORMAP_XCOLORMAP(cmap)  (gdk_x11_colormap_get_xcolormap (cmap))
@@ -72,8 +76,10 @@ gint     gdk_x11_get_default_screen     
 #define GDK_IMAGE_XIMAGE(image)       (gdk_x11_image_get_ximage (image))
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 #define GDK_DISPLAY()                 gdk_display
 #endif
+#endif
 
 #ifdef GDK_COMPILATION
 
@@ -100,8 +106,10 @@ gint     gdk_x11_get_default_screen     
 #else /* GDK_COMPILATION */
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 #define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
 #endif
+#endif
 
 #define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display))
 
@@ -124,8 +132,10 @@ gint     gdk_x11_get_default_screen     
 GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
 					 VisualID   xvisualid);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 GdkVisual* gdkx_visual_get            (VisualID   xvisualid);
 #endif
+#endif
 
 #ifdef GDK_ENABLE_BROKEN
 /* XXX: An X Colormap is useless unless we also have the visual. */
@@ -159,11 +169,13 @@ XID      gdk_x11_screen_get_monitor_outp
                                               gint       monitor_num);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 gpointer      gdk_xid_table_lookup   (XID              xid);
 gboolean      gdk_net_wm_supports    (GdkAtom    property);
 void          gdk_x11_grab_server    (void);
 void          gdk_x11_ungrab_server  (void);
 #endif
+#endif
 
 GdkDisplay   *gdk_x11_lookup_xdisplay (Display *xdisplay);
 
@@ -178,11 +190,13 @@ Atom		      gdk_x11_get_xatom_by_name_fo
 G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay  *display,
 							  Atom         xatom);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 Atom                  gdk_x11_atom_to_xatom     (GdkAtom      atom);
 GdkAtom               gdk_x11_xatom_to_atom     (Atom         xatom);
 Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
 G_CONST_RETURN gchar *gdk_x11_get_xatom_name    (Atom         xatom);
 #endif
+#endif
 
 void	    gdk_x11_display_grab	      (GdkDisplay *display);
 void	    gdk_x11_display_ungrab	      (GdkDisplay *display);
Index: gdk/x11/gdkproperty-x11.c
===================================================================
--- gdk/x11/gdkproperty-x11.c	(Revision 21183)
+++ gdk/x11/gdkproperty-x11.c	(Arbeitskopie)
@@ -265,6 +265,8 @@ _gdk_x11_precache_atoms (GdkDisplay     
  * with the same string value.
  * 
  * Return value: the X atom corresponding to @atom.
+ *
+ * Deprecated: 2.16: Use gdk_x11_atom_to_xatom_for_display() instead.
  **/
 Atom
 gdk_x11_atom_to_xatom (GdkAtom atom)
@@ -332,11 +334,13 @@ gdk_x11_xatom_to_atom_for_display (GdkDi
 /**
  * gdk_x11_xatom_to_atom:
  * @xatom: an X atom for the default GDK display
- * 
- * Convert from an X atom for the default display to the corresponding
- * #GdkAtom.
- * 
- * Return value: the corresponding G#dkAtom.
+ *
+ * Convert from an X atom for the default display
+ * to the corresponding #GdkAtom.
+ *
+ * Return value: the corresponding #GdkAtom.
+ *
+ * Deprecated: 2.16: Use gdk_x11_xatom_to_atom_for_display() instead.
  **/
 GdkAtom
 gdk_x11_xatom_to_atom (Atom xatom)
@@ -466,6 +470,8 @@ gdk_x11_get_xatom_by_name_for_display (G
  * faster than XInternAtom(), which is a round trip to the server each time.
  * 
  * Return value: a X atom for GDK's default display.
+ *
+ * Deprecated: 2.16: Use gdk_x11_get_xatom_by_name_for_display() instead.
  **/
 Atom
 gdk_x11_get_xatom_by_name (const gchar *atom_name)
@@ -510,6 +516,8 @@ gdk_x11_get_xatom_name_for_display (GdkD
  * 
  * Return value: name of the X atom; this string is owned by GTK+,
  *   so it shouldn't be modifed or freed. 
+ *
+ * Deprecated: 2.16: Use gdk_x11_get_xatom_name_for_display() instead.
  **/
 G_CONST_RETURN gchar *
 gdk_x11_get_xatom_name (Atom xatom)
Index: gdk/x11/gdkvisual-x11.c
===================================================================
--- gdk/x11/gdkvisual-x11.c	(Revision 21183)
+++ gdk/x11/gdkvisual-x11.c	(Arbeitskopie)
@@ -578,6 +578,8 @@ gdk_x11_screen_lookup_visual (GdkScreen 
  * Returns a #GdkVisual corresponding to a X visual. 
  * 
  * Return value: the #GdkVisual.
+ *
+ * Deprecated: 2.16: Use gdk_x11_screen_lookup_visual() instead.
  **/
 GdkVisual*
 gdkx_visual_get (VisualID xvisualid)
Index: gdk/x11/gdkevents-x11.c
===================================================================
--- gdk/x11/gdkevents-x11.c	(Revision 21183)
+++ gdk/x11/gdkevents-x11.c	(Arbeitskopie)
@@ -2849,6 +2849,8 @@ gdk_x11_screen_supports_net_wm_hint (Gdk
  * gdk_x11_screen_supports_net_wm_hint() for complete details.
  * 
  * Return value: %TRUE if the window manager supports @property
+ *
+ * Deprecated: 2.16: Use gdk_x11_screen_supports_net_wm_hint() instead.
  **/
 gboolean
 gdk_net_wm_supports (GdkAtom property)
Index: gdk/x11/gdkxid.c
===================================================================
--- gdk/x11/gdkxid.c	(Revision 21183)
+++ gdk/x11/gdkxid.c	(Arbeitskopie)
@@ -111,6 +111,8 @@ gdk_xid_table_lookup_for_display (GdkDis
  * 
  * Return value: the associated Gdk object, which may be a #GdkPixmap,
  * a #GdkWindow or a #GdkFont.
+ *
+ * Deprecated: 2.16: Use gdk_xid_table_lookup_for_display() instead.
  **/
 gpointer
 gdk_xid_table_lookup (XID xid)
Index: gdk/x11/gdkmain-x11.c
===================================================================
--- gdk/x11/gdkmain-x11.c	(Revision 21183)
+++ gdk/x11/gdkmain-x11.c	(Arbeitskopie)
@@ -846,6 +846,8 @@ _gdk_region_get_xrectangles (const GdkRe
  * To ungrab the server again, use gdk_x11_ungrab_server(). 
  *
  * gdk_x11_grab_server()/gdk_x11_ungrab_server() calls can be nested.
+ *
+ * Deprecated: 2.16: Use gdk_x11_display_grab() instead.
  **/ 
 void
 gdk_x11_grab_server (void)
@@ -858,6 +860,8 @@ gdk_x11_grab_server (void)
  *
  * Ungrab the default display after it has been grabbed with 
  * gdk_x11_grab_server(). 
+ *
+ * Deprecated: 2.16: Use gdk_x11_display_ungrab() instead.
  **/
 void
 gdk_x11_ungrab_server (void)
@@ -873,6 +877,8 @@ gdk_x11_ungrab_server (void)
  * Return value: returns the screen number specified by
  *   the --display command line option or the DISPLAY environment
  *   variable when gdk_init() calls XOpenDisplay().
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_number() instead.
  **/
 gint
 gdk_x11_get_default_screen (void)
@@ -887,6 +893,8 @@ gdk_x11_get_default_screen (void)
  * (see gdk_x11_get_default_screen()).  
  * 
  * Return value: an Xlib <type>Window</type>.
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_root_window() instead.
  **/
 Window
 gdk_x11_get_default_root_xwindow (void)
@@ -902,6 +910,8 @@ gdk_x11_get_default_root_xwindow (void)
  * Return value: the Xlib <type>Display*</type> for the display
  * specified in the <option>--display</option> command line option 
  * or the <envar>DISPLAY</envar> environment variable.
+ *
+ * Deprecated: 2.16: Use gdk_x11_display_get_xdisplay() instead.
  **/
 Display *
 gdk_x11_get_default_xdisplay (void)
