Update the docs to state which out parameters may be NULL. (#360870,

2006-10-09  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state):
        Update the docs to state which out parameters may be NULL.
        (#360870, Attilio Fiandrotti)

diff --git a/ChangeLog b/ChangeLog
index 6eacc5d6bc68c570ea88871f59e85a2dc423e655..80c37b3f09deb11b6c8ae3b6229d7fbbf41604c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkprintunixdialog.c (update_dialog_from_capabilities): Fix

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 4c749287ca9b54902f78eabf316a03bade0bdb54..779090f04eaf0a66789436da20995f9e0f155078 100644 (file)
--- 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