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

girepository/ginfo.c tools/generate.c

Browse Source 
2008-02-21  Mark Doffman  <mark.doffman@codethink.co.uk>

    * girepository/ginfo.c
    * tools/generate.c

    Change the way that external references with no namespace
    are dealt with. External references with no namespace
    are placed into the XML as-if they are a local reference.
    This is temporary, but helps with roundtrip tests.

WARNING: This commit does not compile. It is a partial change.

svn path=/trunk/; revision=134
This commit is contained in:
Mark Doffman 2008-03-10 17:47:26 +00:00 committed by Johan Dahlin
parent 7cd41630af
commit e8fa684588
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ginfo.c
View File

@ -166,24 +166,30 @@ g_info_from_entry (GMetadata *metadata,
result = g_info_new (entry->blob_type, NULL, metadata, entry->offset); result = g_info_new (entry->blob_type, NULL, metadata, entry->offset);
else else
{ {
const gchar *namespace = g_metadata_get_string (metadata, entry->offset); const gchar *namespace = NULL;
const gchar *name = g_metadata_get_string (metadata, entry->name); const gchar *name = NULL;
GIRepository *repository = g_irepository_get_default (); GIRepository *repository = g_irepository_get_default ();
namespace = g_metadata_get_string (metadata, entry->offset);
name = g_metadata_get_string (metadata, entry->name);
result = g_irepository_find_by_name (repository, namespace, name); result = g_irepository_find_by_name (repository, namespace, name);
if (result == NULL) if (result == NULL)
{ {
GIUnresolvedInfo *unresolved; GIUnresolvedInfo *unresolved;
unresolved = g_new0 (GIUnresolvedInfo, 1); unresolved = g_new0 (GIUnresolvedInfo, 1);
unresolved->type = GI_INFO_TYPE_UNRESOLVED; unresolved->type = GI_INFO_TYPE_UNRESOLVED;
unresolved->ref_count = 1; unresolved->ref_count = 1;
unresolved->container = NULL; unresolved->container = NULL;
unresolved->name = name; unresolved->name = name;
if (entry->offset)
{
unresolved->namespace = namespace; unresolved->namespace = namespace;
}
else
{
unresolved->namespace = NULL;
}
result = (GIBaseInfo*)unresolved; result = (GIBaseInfo*)unresolved;
} }
} }