From fe9e09a54279ea318bdc8305a498ba8aeabaf211 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Sat, 29 Nov 2008 06:31:17 +0000
Subject: [PATCH] Improve deprecation annotations

svn path=/trunk/; revision=21814
---
 ChangeLog         |  4 ++++
 gtk/gtkbindings.c | 24 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3aecd3003..a89965ae82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkbindings.c: Improve deprecation annotations.
+
 2008-11-26  Christian Dywan  <christian@imendio.com>
 
 	Bug 561504 – testgtk should load rc file from sub folder
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 49c1e7918d..cdf7951b2d 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -706,13 +706,26 @@ gtk_binding_entry_clear_internal (GtkBindingSet  *binding_set,
   entry = binding_entry_new (binding_set, keyval, modifiers);
 }
 
+/**
+ * gtk_binding_entry_add:
+ * @binding_set: @binding_set to clear an entry of
+ * @keyval:      key value of binding to clear
+ * @modifiers:   key modifier of binding to clear
+ *
+ * Adds a binding entry.
+ *
+ * Deprecated: 2.12: Use gtk_binding_entry_add_signal() instead.
+ */
+
 /**
  * gtk_binding_entry_clear:
  * @binding_set: @binding_set to clear an entry of
  * @keyval:      key value of binding to clear
  * @modifiers:   key modifier of binding to clear
  *
- * Use of this function is deprecated.
+ * Clears a binding entry.
+ *
+ * Deprecated: 2.12: Use gtk_binding_entry_remove() instead.
  **/
 void
 gtk_binding_entry_clear (GtkBindingSet	*binding_set,
@@ -790,7 +803,10 @@ gtk_binding_entry_remove (GtkBindingSet	 *binding_set,
  * @signal_name:  signal name to be bound
  * @binding_args: list of #GtkBindingArg signal arguments
  *
- * Deprecated.
+ * Override or install a new key binding for @keyval with @modifiers on
+ * @binding_set.
+ *
+ * Deprecated: 2.12: Use gtk_binding_entry_add_signal() instead.
  **/
 void
 gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
@@ -1576,9 +1592,11 @@ gtk_binding_parse_bind (GScanner       *scanner,
  * gtk_binding_parse_binding:
  * @scanner: GtkRC scanner
  *
- * Deprecated as public API, used only internally.
+ * Parse a binding entry from a gtkrc file.
  *
  * Return value: expected token upon errors, %G_TOKEN_NONE on success.
+ *
+ * Deprecated: 2.12: There should be no need to call this function outside GTK+.
  **/
 guint
 gtk_binding_parse_binding (GScanner *scanner)