Index: docs/reference/gdk/tmpl/properties.sgml
===================================================================
--- docs/reference/gdk/tmpl/properties.sgml	(Revision 21170)
+++ docs/reference/gdk/tmpl/properties.sgml	(Arbeitskopie)
@@ -76,29 +76,6 @@ in the Xlib API.
 </para>
 
 
-
-<!-- ##### FUNCTION gdk_text_property_to_text_list ##### -->
-<para>
-Converts a text string from the encoding as it is stored in
-a property into an array of strings in the encoding of
-the current local. (The elements of the array represent
-the nul-separated elements of the original text string.)
-</para>
-
-@encoding: an atom representing the encoding. The most common
-           values for this are <literal>STRING</literal>,
-           or <literal>COMPOUND_TEXT</literal>. This is
-           value used as the type for the property.
-@format: the format of the property.
-@text: the text data.
-@length: the length of the property, in items.
-@list: location to store a terminated array of strings
-       in the encoding of the current locale. This
-       array should be freed using gdk_free_text_list().
-@Returns: the number of strings stored in @list, or 0,
-          if the conversion failed.
-
-
 <!-- ##### FUNCTION gdk_text_property_to_text_list_for_display ##### -->
 <para>
 
@@ -150,20 +127,6 @@ gdk_text_property_to_text_list().
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_string_to_compound_text ##### -->
-<para>
-Converts a string from the encoding of the current locale 
-into a form suitable for storing in a window property.
-</para>
-
-@str: a nul-terminated string.
-@encoding: location to store the encoding atom (to be used as the type for the property).
-@format: location to store the format for the property.
-@ctext: location to store newly allocated data for the property.
-@length: location to store the length of @ctext in items.
-@Returns: 0 upon sucess, non-zero upon failure.
-
-
 <!-- ##### FUNCTION gdk_string_to_compound_text_for_display ##### -->
 <para>
 
Index: gdk/gdk.symbols
===================================================================
--- gdk/gdk.symbols	(Revision 21170)
+++ gdk/gdk.symbols	(Arbeitskopie)
@@ -173,12 +173,14 @@ gdk_screen_height_mm G_GNUC_CONST
 
 #if IN_HEADER(__GDK_PROPERTY_H__)
 #if IN_FILE(__GDK_SELECTION_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gdk_string_to_compound_text
 gdk_text_property_to_text_list
 gdk_text_property_to_utf8_list
 gdk_utf8_to_compound_text
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_PROPERTY_H__)
 #if IN_FILE(__GDK_PROPERTY_X11_C__)
Index: gdk/gdkproperty.h
===================================================================
--- gdk/gdkproperty.h	(Revision 21170)
+++ gdk/gdkproperty.h	(Arbeitskopie)
@@ -67,6 +67,7 @@ void     gdk_property_change (GdkWindow 
 void     gdk_property_delete (GdkWindow     *window,
 			      GdkAtom        property);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 gint gdk_text_property_to_text_list (GdkAtom        encoding,
 				     gint           format,
 				     const guchar  *text,
@@ -88,6 +89,7 @@ gint gdk_string_to_compound_text    (con
 				     guchar       **ctext,
 				     gint          *length);
 #endif
+#endif
 
 gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
 						 GdkAtom         encoding,
Index: gdk/gdkselection.c
===================================================================
--- gdk/gdkselection.c	(Revision 21170)
+++ gdk/gdkselection.c	(Arbeitskopie)
@@ -60,6 +60,29 @@ gdk_selection_send_notify (GdkNativeWind
 					 target, property, time);
 }
 
+/**
+ * gdk_text_property_to_text_list:
+ * @encoding: an atom representing the encoding. The most common
+ *            values for this are <literal>STRING</literal>,
+ *            or <literal>COMPOUND_TEXT</literal>. This is
+ *            value used as the type for the property.
+ * @format: the format of the property.
+ * @text: the text data.
+ * @length: the length of the property, in items.
+ * @list: location to store a terminated array of strings
+ *        in the encoding of the current locale. This
+ *        array should be freed using gdk_free_text_list().
+ *
+ * Converts a text string from the encoding as it is stored in
+ * a property into an array of strings in the encoding of
+ * the current local. (The elements of the array represent
+ * the nul-separated elements of the original text string.)
+ *
+ * Return value: the number of strings stored in @list, or 0,
+ *         if the conversion failed.
+ *
+ * Deprecated: 2.16: Use gdk_text_property_to_text_list_for_display() instead.
+ **/
 gint
 gdk_text_property_to_text_list (GdkAtom       encoding,
 				gint          format, 
@@ -85,6 +108,8 @@ gdk_text_property_to_text_list (GdkAtom 
  * 
  * Return value: the number of strings in the resulting
  *               list.
+ *
+ * Deprecated: 2.16: Use gdk_text_property_to_utf8_list_for_display() instead.
  **/
 gint 
 gdk_text_property_to_utf8_list (GdkAtom        encoding,
@@ -97,6 +122,22 @@ gdk_text_property_to_utf8_list (GdkAtom 
 						     encoding, format, text, length, list);
 }
 
+/**
+ * gdk_string_to_compound_text:
+ * @str: a nul-terminated string.
+ * @encoding: location to store the encoding atom (to be used as the
+ *            type for the property).
+ * @format: location to store the format for the property.
+ * @ctext: location to store newly allocated data for the property.
+ * @length: location to store the length of @ctext in items.
+ *
+ * Converts a string from the encoding of the current locale 
+ * into a form suitable for storing in a window property.
+ *
+ * Return value: 0 upon sucess, non-zero upon failure.
+ *
+ * Deprecated: 2.16: Use gdk_string_to_compound_text_for_display() instead.
+ **/
 gint
 gdk_string_to_compound_text (const gchar *str,
 			     GdkAtom     *encoding,
@@ -122,6 +163,8 @@ gdk_string_to_compound_text (const gchar
  * 
  * Return value: %TRUE if the conversion succeeded, otherwise
  *               false.
+ *
+ * Deprecated: 2.16: Use gdk_utf8_to_compound_text_for_display() instead.
  **/
 gboolean
 gdk_utf8_to_compound_text (const gchar *str,
