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

Bug 557791 – g_irepository_require() could return a GTypelib *

Browse Source 
svn path=/trunk/; revision=816
This commit is contained in:
Colin Walters 2008-10-25 15:48:50 +00:00
parent 832328d59a
commit 310f119141
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
girepository.c
View File

@ -1029,9 +1029,9 @@ find_namespace_latest (const gchar *namespace,
* version @version of namespace may be specified. If @version is
* not specified, the latest will be used.
*
* Returns: %TRUE if successful, %NULL otherwise
* Returns: a pointer to the #GTypelib if successful, %NULL otherwise
*/
gboolean
GTypelib *
g_irepository_require (GIRepository *repository,
const gchar *namespace,
const gchar *version,
@ -1039,7 +1039,7 @@ g_irepository_require (GIRepository *repository,
GError **error)
{
GMappedFile *mfile;
gboolean ret = FALSE;
GTypelib *ret = NULL;
Header *header;
GTypelib *typelib = NULL;
const gchar *typelib_namespace, *typelib_version;
@ -1053,9 +1053,10 @@ g_irepository_require (GIRepository *repository,
repository = get_repository (repository);
if (get_registered_status (repository, namespace, version, allow_lazy,
&is_lazy, &version_conflict))
return TRUE;
typelib = get_registered_status (repository, namespace, version, allow_lazy,
&is_lazy, &version_conflict);
if (typelib)
return typelib;
if (version_conflict != NULL)
{
@ -1063,7 +1064,7 @@ g_irepository_require (GIRepository *repository,
G_IREPOSITORY_ERROR_NAMESPACE_VERSION_CONFLICT,
"Requiring namespace '%s' version '%s', but '%s' is already loaded",
namespace, version, version_conflict);
return FALSE;
return NULL;
}
if (version != NULL)
@ -1121,7 +1122,7 @@ g_irepository_require (GIRepository *repository,
g_typelib_free (typelib);
goto out;
}
ret = TRUE;
ret = typelib;
out:
g_free (tmp_version);
g_free (path);

2
girepository.h
View File

@ -87,7 +87,7 @@ gboolean g_irepository_is_registered (GIRepository *repository,
GIBaseInfo * g_irepository_find_by_name (GIRepository *repository,
const gchar *namespace,
const gchar *name);
gboolean g_irepository_require (GIRepository *repository,
GTypelib * g_irepository_require (GIRepository *repository,
const gchar *namespace,
const gchar *version,
GIRepositoryLoadFlags flags,