diff options
author | Colin Walters <walters@src.gnome.org> | 2008-08-30 20:31:07 +0000 |
---|---|---|
committer | Colin Walters <walters@src.gnome.org> | 2008-08-30 20:31:07 +0000 |
commit | 8e9b9ce60747b262e3e9c4be4ae85ee1319ae3f4 (patch) | |
tree | 1ddd59b84d74350c3b3afbf7df2092bfc001f053 /girepository/girepository.h | |
parent | 3be5f52707d68d0fb02f4415dc90450aa64ffea1 (diff) | |
download | gobject-introspection-8e9b9ce60747b262e3e9c4be4ae85ee1319ae3f4.tar.gz |
Put dependencies in typelibs, resolve them when loading
* gir/Makefile.am: Dep on Makefile
* girepository/ginfo.c: Print out a nicer error
message if we failed to load something.
* girepository/girepository.c: Clean up
default typelib handling; remove global
default_typelib variable. Ensure we handle
NULL repository in more places.
Support dependency resolution.
* tests/Makefile.am: Kill off gobject.gir,
it conflicts with the real one.
* tests/Object.gir: Depend on GObject.
* tools/generate.c: Take --includedir
argument to say which directories to search
for typelibs. Print out dependencies.
svn path=/trunk/; revision=541
Diffstat (limited to 'girepository/girepository.h')
-rw-r--r-- | girepository/girepository.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/girepository/girepository.h b/girepository/girepository.h index 4c680169..f3b1f484 100644 --- a/girepository/girepository.h +++ b/girepository/girepository.h @@ -72,8 +72,10 @@ struct _GIRepositoryClass GType g_irepository_get_type (void) G_GNUC_CONST; GIRepository *g_irepository_get_default (void); -const gchar * g_irepository_register (GIRepository *repository, - GTypelib *typelib); +void g_irepository_prepend_search_path (const char *directory); +const char * g_irepository_load_typelib (GIRepository *repository, + GTypelib *typelib, + GError **error); void g_irepository_unregister (GIRepository *repository, const gchar *namespace); gboolean g_irepository_is_registered (GIRepository *repository, @@ -81,9 +83,11 @@ gboolean g_irepository_is_registered (GIRepository *repository, GIBaseInfo * g_irepository_find_by_name (GIRepository *repository, const gchar *namespace, const gchar *name); -const char * g_irepository_require (GIRepository *repository, +gboolean g_irepository_require (GIRepository *repository, const char *namespace, GError **error); +gchar ** g_irepository_get_dependencies (GIRepository *repository, + const char *namespace); gchar ** g_irepository_get_namespaces (GIRepository *repository); GIBaseInfo * g_irepository_find_by_gtype (GIRepository *repository, GType gtype); @@ -142,8 +146,7 @@ typedef enum GI_INFO_TYPE_PROPERTY, GI_INFO_TYPE_FIELD, GI_INFO_TYPE_ARG, - GI_INFO_TYPE_TYPE, - GI_INFO_TYPE_UNRESOLVED + GI_INFO_TYPE_TYPE } GIInfoType; |