Merge branch 'mwleeds/log-set-enabled-docs-2' into 'main'

gmessages: Clarify g_log_set_debug_enabled() behavior

Closes #2609

See merge request GNOME/glib!2530
This commit is contained in:
Philip Withnall 2022-03-03 09:31:42 +00:00
commit 16057f78e8

View File

@ -2893,8 +2893,8 @@ _g_log_writer_fallback (GLogLevelFlags log_level,
* other logging functions; it should only be used from %GLogWriterFunc * other logging functions; it should only be used from %GLogWriterFunc
* implementations. * implementations.
* *
* Note also that the value of this does not depend on `G_MESSAGES_DEBUG`, as * Note also that the value of this does not depend on `G_MESSAGES_DEBUG`; see
* it is domain-dependent. * the docs for g_log_set_debug_enabled().
* *
* Returns: %TRUE if debug output is enabled, %FALSE otherwise * Returns: %TRUE if debug output is enabled, %FALSE otherwise
* *
@ -2910,9 +2910,9 @@ g_log_get_debug_enabled (void)
* g_log_set_debug_enabled: * g_log_set_debug_enabled:
* @enabled: %TRUE to enable debug output, %FALSE otherwise * @enabled: %TRUE to enable debug output, %FALSE otherwise
* *
* Enable or disable debug output from the GLib logging system. This * Enable or disable debug output from the GLib logging system for all domains.
* value interacts disjunctively with `G_MESSAGES_DEBUG` if either of them * This value interacts disjunctively with `G_MESSAGES_DEBUG` if either of
* would allow a debug message to be outputted, it will be. * them would allow a debug message to be outputted, it will be.
* *
* Note that this should not be used from within library code to enable debug * Note that this should not be used from within library code to enable debug
* output it is intended for external use. * output it is intended for external use.