mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-27 07:56:14 +01:00
Ensure we always call init_globals
svn path=/trunk/; revision=938
This commit is contained in:
parent
b87284dac2
commit
e6cf04484d
@ -82,7 +82,7 @@ g_irepository_class_init (GIRepositoryClass *class)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
init_globals ()
|
init_globals (void)
|
||||||
{
|
{
|
||||||
g_static_mutex_lock (&globals_lock);
|
g_static_mutex_lock (&globals_lock);
|
||||||
|
|
||||||
@ -179,14 +179,13 @@ get_typelib_dependencies (GTypelib *typelib)
|
|||||||
static GIRepository *
|
static GIRepository *
|
||||||
get_repository (GIRepository *repository)
|
get_repository (GIRepository *repository)
|
||||||
{
|
{
|
||||||
|
init_globals ();
|
||||||
|
|
||||||
if (repository != NULL)
|
if (repository != NULL)
|
||||||
return repository;
|
return repository;
|
||||||
else
|
else
|
||||||
{
|
|
||||||
init_globals ();
|
|
||||||
return default_repository;
|
return default_repository;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
static GTypelib *
|
static GTypelib *
|
||||||
check_version_conflict (GTypelib *typelib,
|
check_version_conflict (GTypelib *typelib,
|
||||||
|
Loading…
Reference in New Issue
Block a user