Index: gdk/gdkevents.c
===================================================================
--- gdk/gdkevents.c	(Revision 21170)
+++ gdk/gdkevents.c	(Arbeitskopie)
@@ -1257,10 +1257,12 @@ gdk_event_get_type (void)
  * @value: location to store the value of the setting.
  *
  * Obtains a desktop-wide setting, such as the double-click time,
- * for the default screen. See gdk_screen_get_setting().
+ * for the default screen.
  *
  * Returns: %TRUE if the setting existed and a value was stored
  *   in @value, %FALSE otherwise.
+ *
+ * Deprecated: 2.16: Use gdk_screen_get_setting() instead.
  **/
 gboolean
 gdk_setting_get (const gchar *name,
Index: gdk/gdkevents.h
===================================================================
--- gdk/gdkevents.h	(Revision 21170)
+++ gdk/gdkevents.h	(Arbeitskopie)
@@ -550,12 +550,14 @@ void	  gdk_set_show_events		(gboolean	 s
 gboolean  gdk_get_show_events		(void);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GTK_DISABLE_DEPRECATED
 void gdk_add_client_message_filter (GdkAtom       message_type,
 				    GdkFilterFunc func,
 				    gpointer      data);
 
 gboolean gdk_setting_get (const gchar *name,
 			  GValue      *value); 
+#endif
 #endif /* GDK_MULTIHEAD_SAFE */
 
 G_END_DECLS
Index: gdk/gdk.symbols
===================================================================
--- gdk/gdk.symbols	(Revision 21170)
+++ gdk/gdk.symbols	(Arbeitskopie)
@@ -21,7 +21,9 @@
 
 #if IN_HEADER(__GDK_EVENTS_H__)
 #if IN_FILE(__GDK_EVENTS_X11_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gdk_add_client_message_filter
+#endif
 gdk_event_get_graphics_expose
 gdk_events_pending
 #endif
@@ -55,9 +57,11 @@ gdk_event_request_motions
 gdk_event_set_screen
 gdk_get_show_events
 gdk_set_show_events
+#ifndef GDK_DISABLE_DEPRECATED
 gdk_setting_get
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_MAIN_X11_C__)
Index: gdk/x11/gdkevents-x11.c
===================================================================
--- gdk/x11/gdkevents-x11.c	(Revision 21170)
+++ gdk/x11/gdkevents-x11.c	(Arbeitskopie)
@@ -398,6 +398,8 @@ gdk_display_add_client_message_filter (G
  * 
  * Adds a filter to the default display to be called when X ClientMessage events
  * are received. See gdk_display_add_client_message_filter().
+ *
+ * Deprecated: 2.16: Use gdk_display_add_client_message_filter() instead.
  **/
 void 
 gdk_add_client_message_filter (GdkAtom       message_type,
