summaryrefslogtreecommitdiff
path: root/gtk/gtkaccelgroup.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-03-12 21:23:25 -0500
committerMatthias Clasen <mclasen@redhat.com>2011-03-12 21:23:25 -0500
commit02ac322c9a279c70a03490353f2c22e7405b7f6f (patch)
tree6ba3eb35b18a4209780b75e7cd1aadeda4398288 /gtk/gtkaccelgroup.c
parent4a44f3f6e1ebbc63a3d52522deb8be58acb5bc86 (diff)
downloadgtk+-02ac322c9a279c70a03490353f2c22e7405b7f6f.tar.gz
Fix annotations for gtk_accelerator_parse
Part of bug 644353, patch by Ulrik Sverdrup.
Diffstat (limited to 'gtk/gtkaccelgroup.c')
-rw-r--r--gtk/gtkaccelgroup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index f131d065fd..a46ac68dc3 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -1147,8 +1147,10 @@ is_hyper (const gchar *string)
/**
* gtk_accelerator_parse:
* @accelerator: string representing an accelerator
- * @accelerator_key: (out): return location for accelerator keyval
- * @accelerator_mods: (out): return location for accelerator modifier mask
+ * @accelerator_key: (out) (allow-none): return location for accelerator
+ * keyval, or %NULL
+ * @accelerator_mods: (out) (allow-none): return location for accelerator
+ * modifier mask, %NULL
*
* Parses a string representing an accelerator. The
* format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1"