diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-05-21 15:25:31 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-05-21 15:25:31 -0400 |
| commit | bba6d3ea85419d410d2f60a0e08eae6a745e5108 (patch) | |
| tree | 66d5092e3c97014682e77994e9be2df8eaee6f7c /libgupnp-igd | |
| parent | c84a41f8b84355ccad0525aa0b494cc5f17e8b9c (diff) | |
| download | gupnp-igd-bba6d3ea85419d410d2f60a0e08eae6a745e5108.tar.gz | |
Add GObject Introspection support
Diffstat (limited to 'libgupnp-igd')
| -rw-r--r-- | libgupnp-igd/Makefile.am | 19 | ||||
| -rw-r--r-- | libgupnp-igd/gupnp-simple-igd.c | 4 | ||||
| -rw-r--r-- | libgupnp-igd/gupnp-simple-igd.h | 9 |
3 files changed, 21 insertions, 11 deletions
diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am index 32e9aea..7cadfcd 100644 --- a/libgupnp-igd/Makefile.am +++ b/libgupnp-igd/Makefile.am @@ -46,7 +46,22 @@ libgupnp_igd_1_0_la_LIBADD = \ EXTRA_DIST = gupnp-simple-igd-marshal.list -CLEANFILES = $(BUILT_SOURCES) + +include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = GUPnPIgd-1.0.gir +GUPnPIgd_1_0_gir_NAMESPACE = GUPnPIgd +GUPnPIgd_1_0_gir_VERSION = 1.0 +GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) +GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) +GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 +GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 +GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) + +girdir = $(INTROSPECTION_GIRDIR) +dist_gir_DATA = $(INTROSPECTION_GIRS) +typelibdir = $(INTROSPECTION_TYPELIBDIR) +typelib_DATA = GUPnPIgd-1.0.typelib + +CLEANFILES = $(BUILT_SOURCES) $(dist_gir_DATA) $(typelib_DATA) DISTCLEANFILES = $(BUILT_SOURCES) MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES) - diff --git a/libgupnp-igd/gupnp-simple-igd.c b/libgupnp-igd/gupnp-simple-igd.c index 447af93..cfe4390 100644 --- a/libgupnp-igd/gupnp-simple-igd.c +++ b/libgupnp-igd/gupnp-simple-igd.c @@ -147,9 +147,9 @@ static void gupnp_simple_igd_remove_port_real (GUPnPSimpleIgd *self, guint external_port); GQuark -gupnp_simple_igd_get_error_domain (void) +gupnp_simple_igd_error_quark (void) { - return g_quark_from_static_string ("fs-upnp-simple-igd-error"); + return g_quark_from_static_string ("gupnp-simple-igd-error"); } diff --git a/libgupnp-igd/gupnp-simple-igd.h b/libgupnp-igd/gupnp-simple-igd.h index 574699e..1b6118d 100644 --- a/libgupnp-igd/gupnp-simple-igd.h +++ b/libgupnp-igd/gupnp-simple-igd.h @@ -94,12 +94,7 @@ struct _GUPnPSimpleIgd GUPnPSimpleIgdPrivate *priv; }; -/** - * GUPNP_SIMPLE_IGD_ERROR: - * - * The #GError domain for error coming out of GUPnpSimpleIGD - */ -#define GUPNP_SIMPLE_IGD_ERROR (gupnp_simple_igd_get_error_domain ()) +#define GUPNP_SIMPLE_IGD_ERROR (gupnp_simple_igd_error_quark ()) /** * GUPnPSimpleIgdError: @@ -113,7 +108,7 @@ typedef enum { GUPNP_SIMPLE_IGD_ERROR_EXTERNAL_ADDRESS, } GUPnPSimpleIgdError; -GQuark gupnp_simple_igd_get_error_domain (void); +GQuark gupnp_simple_igd_error_quark (void); GType gupnp_simple_igd_get_type (void); |