summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2023-08-14 12:45:30 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2023-08-14 12:45:30 +0000
commit40fb81f0ea50d694a420cea7b914d9226ede6a43 (patch)
treeff921144226e4aca9d79458d460843c0d954a77e
parentf522c3f94d67493c58e9b0e27a7862c2e7ec105b (diff)
parent572f8ab534a2a28737303dc4ea26f927e4a72f99 (diff)
downloadglib-40fb81f0ea50d694a420cea7b914d9226ede6a43.tar.gz
Merge branch 'backport-3529-menu-exporter-locking-glib-2-76' into 'glib-2-76'
Backport !3529 “gmenuexporter: synchronization in org_gtk_Menus_get_interface.” to glib-2-76 See merge request GNOME/glib!3531
-rw-r--r--gio/gmenuexporter.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gio/gmenuexporter.c b/gio/gmenuexporter.c
index 1860b34e8..67aac19da 100644
--- a/gio/gmenuexporter.c
+++ b/gio/gmenuexporter.c
@@ -53,8 +53,9 @@ static GDBusInterfaceInfo *
org_gtk_Menus_get_interface (void)
{
static GDBusInterfaceInfo *interface_info;
+ static gsize interface_info_initialized = 0;
- if (interface_info == NULL)
+ if (g_once_init_enter (&interface_info_initialized))
{
GError *error = NULL;
GDBusNodeInfo *info;
@@ -79,6 +80,8 @@ org_gtk_Menus_get_interface (void)
g_assert (interface_info != NULL);
g_dbus_interface_info_ref (interface_info);
g_dbus_node_info_unref (info);
+
+ g_once_init_leave (&interface_info_initialized, 1);
}
return interface_info;