From 40e359d89332478d31e723fdd82360364445f110 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Oct 2006 14:36:16 +0000 Subject: [PATCH] Update the docs to state which out parameters may be NULL. (#360870, 2006-10-09 Matthias Clasen * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): Update the docs to state which out parameters may be NULL. (#360870, Attilio Fiandrotti) --- ChangeLog | 6 ++++++ gdk/x11/gdkkeys-x11.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6eacc5d6bc..80c37b3f09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-09 Matthias Clasen + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Update the docs to state which out parameters may be NULL. + (#360870, Attilio Fiandrotti) + 2006-10-08 Matthias Clasen * gtk/gtkprintunixdialog.c (update_dialog_from_capabilities): Fix diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 4c749287ca..779090f04e 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -874,8 +874,8 @@ gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap, * gdk_keymap_get_entries_for_keycode: * @keymap: a #GdkKeymap or %NULL to use the default keymap * @hardware_keycode: a keycode - * @keys: return location for array of #GdkKeymapKey, or NULL - * @keyvals: return location for array of keyvals, or NULL + * @keys: return location for array of #GdkKeymapKey, or %NULL + * @keyvals: return location for array of keyvals, or %NULL * @n_entries: length of @keys and @keyvals * * Returns the keyvals bound to @hardware_keycode. @@ -1301,11 +1301,11 @@ translate_keysym (GdkKeymapX11 *keymap_x11, * @hardware_keycode: a keycode * @state: a modifier state * @group: active keyboard group - * @keyval: return location for keyval - * @effective_group: return location for effective group - * @level: return location for level - * @consumed_modifiers: return location for modifiers that were used to determine the group or level - * + * @keyval: return location for keyval, or %NULL + * @effective_group: return location for effective group, or %NULL + * @level: return location for level, or %NULL + * @consumed_modifiers: return location for modifiers that were used to + * determine the group or level, or %NULL * * Translates the contents of a #GdkEventKey into a keyval, effective * group, and level. Modifiers that affected the translation and