luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 12:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gmain: Support nullable GMainContext in all the functions

Browse Source 
All the GMainContext functions are supposed to work with a NULL context to
use the default one, but some were not doing it.

So adjust them.
This commit is contained in:
Marco Trevisan (Treviño) 2023-01-25 20:27:33 +01:00
parent 3b2c7aba99
commit 1f8787116a
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
glib/gmain.c
View File

@ -3512,6 +3512,9 @@ g_main_dispatch (GMainContext *context)
* You must be the owner of a context before you * You must be the owner of a context before you
* can call g_main_context_prepare(), g_main_context_query(), * can call g_main_context_prepare(), g_main_context_query(),
* g_main_context_check(), g_main_context_dispatch(). * g_main_context_check(), g_main_context_dispatch().
*
* Since 2.76 @context can be %NULL to use the global-default
* main context.
* *
* Returns: %TRUE if the operation succeeded, and * Returns: %TRUE if the operation succeeded, and
* this thread is now the owner of @context. * this thread is now the owner of @context.
@ -3865,7 +3868,8 @@ g_main_context_prepare (GMainContext *context,
/** /**
* g_main_context_query: * g_main_context_query:
* @context: a #GMainContext * @context: (nullable): a #GMainContext (if %NULL, the global-default
* main context will be used)
* @max_priority: maximum priority source to check * @max_priority: maximum priority source to check
* @timeout_: (out): location to store timeout to be used in polling * @timeout_: (out): location to store timeout to be used in polling
* @fds: (out caller-allocates) (array length=n_fds): location to * @fds: (out caller-allocates) (array length=n_fds): location to
@ -3894,6 +3898,9 @@ g_main_context_query (GMainContext *context,
gint n_poll; gint n_poll;
GPollRec *pollrec, *lastpollrec; GPollRec *pollrec, *lastpollrec;
gushort events; gushort events;
if (context == NULL)
context = g_main_context_default ();
LOCK_CONTEXT (context); LOCK_CONTEXT (context);
@ -3960,7 +3967,8 @@ g_main_context_query (GMainContext *context,
/** /**
* g_main_context_check: * g_main_context_check:
* @context: a #GMainContext * @context: (nullable): a #GMainContext (if %NULL, the global-default
* main context will be used)
* @max_priority: the maximum numerical priority of sources to check * @max_priority: the maximum numerical priority of sources to check
* @fds: (array length=n_fds): array of #GPollFD's that was passed to * @fds: (array length=n_fds): array of #GPollFD's that was passed to
* the last call to g_main_context_query() * the last call to g_main_context_query()
@ -3974,6 +3982,9 @@ g_main_context_query (GMainContext *context,
* You must have successfully acquired the context with * You must have successfully acquired the context with
* g_main_context_acquire() before you may call this function. * g_main_context_acquire() before you may call this function.
* *
* Since 2.76 @context can be %NULL to use the global-default
* main context.
*
* Returns: %TRUE if some sources are ready to be dispatched. * Returns: %TRUE if some sources are ready to be dispatched.
**/ **/
gboolean gboolean
@ -3987,6 +3998,9 @@ g_main_context_check (GMainContext *context,
GPollRec *pollrec; GPollRec *pollrec;
gint n_ready = 0; gint n_ready = 0;
gint i; gint i;
if (context == NULL)
context = g_main_context_default ();
LOCK_CONTEXT (context); LOCK_CONTEXT (context);
@ -4163,16 +4177,23 @@ g_main_context_check (GMainContext *context,
/** /**
* g_main_context_dispatch: * g_main_context_dispatch:
* @context: a #GMainContext * @context: (nullable): a #GMainContext (if %NULL, the global-default
* main context will be used)
* *
* Dispatches all pending sources. * Dispatches all pending sources.
* *
* You must have successfully acquired the context with * You must have successfully acquired the context with
* g_main_context_acquire() before you may call this function. * g_main_context_acquire() before you may call this function.
*
* Since 2.76 @context can be %NULL to use the global-default
* main context.
**/ **/
void void
g_main_context_dispatch (GMainContext *context) g_main_context_dispatch (GMainContext *context)
{ {
if (context == NULL)
context = g_main_context_default ();
LOCK_CONTEXT (context); LOCK_CONTEXT (context);
TRACE (GLIB_MAIN_CONTEXT_BEFORE_DISPATCH (context)); TRACE (GLIB_MAIN_CONTEXT_BEFORE_DISPATCH (context));