Bug 666700 — Add some missing (allow-none) annotations

Add some missing (allow-none) annotations to GContentType, GIcon and
GHashTable methods.

Closes: bgo#666700
This commit is contained in:
Philip Withnall 2011-12-22 00:16:06 +00:00
parent f8843a0feb
commit e98f17e5cf
3 changed files with 7 additions and 7 deletions

View File

@ -1649,7 +1649,7 @@ match_match (TreeMatch *match,
* g_mount_guess_content_type(). * g_mount_guess_content_type().
* *
* Returns: (transfer full) (array zero-terminated=1): an %NULL-terminated * Returns: (transfer full) (array zero-terminated=1): an %NULL-terminated
* array of zero or more content types, or %NULL. Free with g_strfreev() * array of zero or more content types. Free with g_strfreev()
* *
* Since: 2.18 * Since: 2.18
*/ */

View File

@ -94,8 +94,8 @@ g_icon_hash (gconstpointer icon)
/** /**
* g_icon_equal: * g_icon_equal:
* @icon1: pointer to the first #GIcon. * @icon1: (allow-none): pointer to the first #GIcon.
* @icon2: pointer to the second #GIcon. * @icon2: (allow-none): pointer to the second #GIcon.
* *
* Checks if two icons are equal. * Checks if two icons are equal.
* *

View File

@ -1047,7 +1047,7 @@ g_hash_table_destroy (GHashTable *hash_table)
* and has the value %NULL. If you need this distinction, use * and has the value %NULL. If you need this distinction, use
* g_hash_table_lookup_extended(). * g_hash_table_lookup_extended().
* *
* Return value: the associated value, or %NULL if the key is not found * Return value: (allow-none): the associated value, or %NULL if the key is not found
*/ */
gpointer gpointer
g_hash_table_lookup (GHashTable *hash_table, g_hash_table_lookup (GHashTable *hash_table,
@ -1069,8 +1069,8 @@ g_hash_table_lookup (GHashTable *hash_table,
* g_hash_table_lookup_extended: * g_hash_table_lookup_extended:
* @hash_table: a #GHashTable * @hash_table: a #GHashTable
* @lookup_key: the key to look up * @lookup_key: the key to look up
* @orig_key: return location for the original key, or %NULL * @orig_key: (allow-none): return location for the original key, or %NULL
* @value: return location for the value associated with the key, or %NULL * @value: (allow-none): return location for the value associated with the key, or %NULL
* *
* Looks up a key in the #GHashTable, returning the original key and the * Looks up a key in the #GHashTable, returning the original key and the
* associated value and a #gboolean which is %TRUE if the key was found. This * associated value and a #gboolean which is %TRUE if the key was found. This
@ -1532,7 +1532,7 @@ g_hash_table_foreach (GHashTable *hash_table,
* (keep in mind that an O(n) find/foreach operation issued for all n * (keep in mind that an O(n) find/foreach operation issued for all n
* values in a hash table ends up needing O(n*n) operations). * values in a hash table ends up needing O(n*n) operations).
* *
* Return value: The value of the first key/value pair is returned, * Return value: (allow-none): The value of the first key/value pair is returned,
* for which @predicate evaluates to %TRUE. If no pair with the * for which @predicate evaluates to %TRUE. If no pair with the
* requested property is found, %NULL is returned. * requested property is found, %NULL is returned.
* *