Merge branch 'wip/hadess/occurred' into 'master'

docs: Fix "occurred" typos in API documentation

See merge request GNOME/glib!1243
This commit is contained in:
Philip Withnall 2019-11-21 12:45:45 +00:00
commit 7b77439841
3 changed files with 5 additions and 5 deletions

View File

@ -131,7 +131,7 @@ g_pattern_ph_match (const gchar *match_pattern,
return TRUE;
if (next_wildcard_reached)
/* the forthcoming pattern substring up to the next wildcard has
* been matched, but a mismatch occoured for the rest of the
* been matched, but a mismatch occurred for the rest of the
* pattern, following the next wildcard.
* there's no need to advance the current match position any
* further if the rest pattern will not match.

View File

@ -2216,7 +2216,7 @@ g_signal_chain_from_overridden_handler (gpointer instance,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
while (i--)
g_value_unset (param_values + i);
@ -3408,7 +3408,7 @@ g_signal_emit_valist (gpointer instance,
g_free (error);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
while (i--)
g_value_unset (param_values + i);

View File

@ -376,7 +376,7 @@ g_value_set_instance (GValue *value,
g_free (error_msg);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
value_meminit (value, g_type);
value_table->value_init (value);
@ -440,7 +440,7 @@ g_value_init_from_instance (GValue *value,
g_free (error_msg);
/* we purposely leak the value here, it might not be
* in a sane state if an error condition occoured
* in a sane state if an error condition occurred
*/
value_meminit (value, g_type);
value_table->value_init (value);