Index: docs/reference/gdk/tmpl/rgb.sgml
===================================================================
--- docs/reference/gdk/tmpl/rgb.sgml	(Revision 21170)
+++ docs/reference/gdk/tmpl/rgb.sgml	(Arbeitskopie)
@@ -419,29 +419,6 @@ visual should be used when creating wind
 @Returns: The #GdkColormap set by GdkRGB.
 
 
-<!-- ##### FUNCTION gdk_rgb_ditherable ##### -->
-<para>
-Determines whether the preferred visual is ditherable. This function may be
-useful for presenting a user interface choice to the user about which
-dither mode is desired; if the display is not ditherable, it may make
-sense to gray out or hide the corresponding UI widget.
-</para>
-
-@Returns: %TRUE if the preferred visual is ditherable.
-
-
-<!-- ##### FUNCTION gdk_rgb_colormap_ditherable ##### -->
-<para>
-Determines whether the visual associated with @cmap is ditherable. This 
-function may be useful for presenting a user interface choice to the user 
-about which dither mode is desired; if the display is not ditherable, it may 
-make sense to gray out or hide the corresponding UI widget.
-</para>
-
-@cmap: a #GdkColormap
-@Returns: %TRUE if the visual associated with @cmap is ditherable.
-
-
 <!-- ##### FUNCTION gdk_rgb_set_verbose ##### -->
 <para>
 Sets the "verbose" flag. This is generally only useful for debugging.
Index: gdk/gdkscreen.h
===================================================================
--- gdk/gdkscreen.h	(Revision 21170)
+++ gdk/gdkscreen.h	(Arbeitskopie)
@@ -71,8 +71,10 @@ void         gdk_screen_set_default_colo
 					       GdkColormap *colormap);
 GdkColormap* gdk_screen_get_system_colormap   (GdkScreen   *screen);
 GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
+#ifndef GTK_DISABLE_DEPRECATED
 GdkColormap *gdk_screen_get_rgb_colormap      (GdkScreen   *screen);
 GdkVisual *  gdk_screen_get_rgb_visual        (GdkScreen   *screen);
+#endif
 GdkColormap *gdk_screen_get_rgba_colormap     (GdkScreen   *screen);
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
 gboolean     gdk_screen_is_composited	      (GdkScreen   *screen);
Index: gdk/gdk.symbols
===================================================================
--- gdk/gdk.symbols	(Revision 21170)
+++ gdk/gdk.symbols	(Arbeitskopie)
@@ -974,12 +974,14 @@ gdk_region_polygon
 #if IN_FILE(__GDK_RGB_C__)
 gdk_rgb_cmap_free
 gdk_rgb_cmap_new
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_rgb_colormap_ditherable
 gdk_rgb_ditherable
+#endif
 gdk_rgb_find_color
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_rgb_get_colormap
 gdk_rgb_get_visual
-#ifndef GDK_DISABLE_DEPRECATED
 gdk_rgb_init
 gdk_rgb_xpixel_from_rgb G_GNUC_CONST
 gdk_rgb_gc_set_background
@@ -1017,10 +1019,12 @@ gdk_screen_get_default
 
 #if IN_HEADER(__GDK_SCREEN_H__)
 #if IN_FILE(__GDK_RGB_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gdk_screen_get_rgb_colormap
 gdk_screen_get_rgb_visual
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_SCREEN_H__)
 #if IN_FILE(__GDK_EVENTS_X11_C__)
Index: gdk/gdkrgb.c
===================================================================
--- gdk/gdkrgb.c	(Revision 21170)
+++ gdk/gdkrgb.c	(Arbeitskopie)
@@ -3648,6 +3648,20 @@ gdk_draw_indexed_image (GdkDrawable  *dr
 			     image_info->conv_indexed_d, cmap, 0, 0);
 }
 
+/**
+ * gdk_rgb_colormap_ditherable:
+ * @cmap: a #GdkColormap
+ *
+ * Determines whether the visual associated with @cmap
+ * is ditherable. This function may be useful for presenting
+ * a user interface choice to the user about which dither mode
+ * is desired; if the display is not ditherable, it may
+ * make sense to gray out or hide the corresponding UI widget.
+ *
+ * Return value: %TRUE if the visual associated with @cmap is ditherable
+ *
+ * Deprecated: 2.16: The functionality is obsolete.
+ **/
 gboolean
 gdk_rgb_colormap_ditherable (GdkColormap *cmap)
 {
@@ -3656,6 +3670,19 @@ gdk_rgb_colormap_ditherable (GdkColormap
   return (image_info->conv != image_info->conv_d);
 }
 
+/**
+ * gdk_rgb_ditherable:
+ *
+ * Determines whether the preferred visual is ditherable.
+ * This function may be useful for presenting a user interface
+ * choice to the user about which dither mode is desired;
+ * if the display is not ditherable, it may make sense to
+ * gray out or hide the corresponding UI widget.
+ *
+ * Return value: %TRUE if the preferred visual is ditherable
+ *
+ * Deprecated: 2.16: The functionality is obsolete.
+ **/
 gboolean
 gdk_rgb_ditherable (void)
 {
@@ -3670,8 +3697,10 @@ gdk_rgb_ditherable (void)
  * data to one colormap and visual, but in the current version it can
  * render to any colormap and visual. So there's no need to call this
  * function.
- * 
+ *
  * Return value: the preferred colormap
+ *
+ * Deprecated: 2.16: The functionality is obsolete.
  **/
 GdkColormap *
 gdk_rgb_get_colormap (void)
@@ -3699,6 +3728,8 @@ gdk_rgb_get_colormap (void)
  * Return value: the preferred colormap
  *
  * Since: 2.2
+ *
+ * Deprecated: 2.16: The functionality is obsolete.
  **/
 GdkColormap *
 gdk_screen_get_rgb_colormap (GdkScreen *screen)
@@ -3726,10 +3757,12 @@ gdk_screen_get_rgb_colormap (GdkScreen *
  * current versions, it's simply the visual GdkRGB would have chosen as 
  * the optimal one in those previous versions. GdkRGB can now render to 
  * drawables with any visual.
- * 
+ *
  * Return value: The #GdkVisual chosen by GdkRGB.
  *
  * Since: 2.2
+ *
+ * Deprecated: 2.16: The functionality is obsolete.
  **/
 GdkVisual *
 gdk_screen_get_rgb_visual (GdkScreen *screen)
@@ -3747,8 +3780,10 @@ gdk_screen_get_rgb_visual (GdkScreen *sc
  * it's simply the visual GdkRGB would have chosen as the optimal one
  * in those previous versions. GdkRGB can now render to drawables with
  * any visual.
- * 
+ *
  * Return value: The #GdkVisual chosen by GdkRGB.
+ *
+ * Deprecated: 2.16: The functionality is obsolete.
  **/
 GdkVisual *
 gdk_rgb_get_visual (void)
Index: gdk/gdkrgb.h
===================================================================
--- gdk/gdkrgb.h	(Revision 21170)
+++ gdk/gdkrgb.h	(Arbeitskopie)
@@ -136,11 +136,13 @@ void gdk_rgb_set_install    (gboolean in
 void gdk_rgb_set_min_colors (gint     min_colors);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 GdkColormap *gdk_rgb_get_colormap (void);
 GdkVisual *  gdk_rgb_get_visual   (void);
 gboolean     gdk_rgb_ditherable   (void);
 gboolean     gdk_rgb_colormap_ditherable (GdkColormap *cmap);
 #endif
+#endif
 
 G_END_DECLS
 
