Enabled gir.

diff --git a/.gitignore b/.gitignore
index 6fce3bf6af947f368c13f7d1aee5914b08a9b248..7e7e8dbc18717e70a923fe9f5bdbcfd14aafc5b1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,6 @@ intltool-*
 Rules-quot
 *.exe
 *.csv
-src/*marshal*.[ch]
\ No newline at end of file
+src/*marshal*.[ch]
+*.gir
+*.typelib
\ No newline at end of file

diff --git a/Makefile.am b/Makefile.am
index dc08cdf947be8399f0a9310a1fc2fd9fe160acaa..02ba24519a6ab479744499b7677ab646e61f9442 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+
 SUBDIRS = po src tests
 
 ACLOCAL_AMFLAGS = -I m4

diff --git a/configure.ac b/configure.ac
index 1f2bffefd0392ba1dbe39cb356e6241fa575d8d7..26b409307c2c4314b41b34405c6ac29119294499 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,9 @@ AC_PROG_LIBTOOL
 AC_PROG_RANLIB
 
 GTK_DOC_CHECK(1.0)
+
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
+
 IT_PROG_INTLTOOL
 
 dnl ******************************

diff --git a/src/Makefile.am b/src/Makefile.am
index 6c6f9b656826f774a93051e3b81e8fca1d7a6f13..83af3a3745f969203535c4789425d34ab01eb3dc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,8 +33,7 @@ libzakform_la_SOURCES = \
 
 libzakform_la_LDFLAGS = -no-undefined
 
-libzakform_include_HEADERS = \
-                             libzakform.h \
+gir_include = \
                              commons.h \
                              zakformmarshal.h \
                              form.h \
@@ -52,6 +51,10 @@ libzakform_include_HEADERS = \
                              formvalidatorcomparedate.h \
                              formvalidatorcomposite.h
 
+libzakform_include_HEADERS = \
+                             libzakform.h \
+                             $(gir_include)
+
 libzakform_includedir = $(includedir)/libzakform
 
 install-exec-hook:
@@ -59,3 +62,29 @@ install-exec-hook:
 
 uninstall-hook:
        rm -rf "$(libdir)/$(PACKAGE)"
+
+CLEANFILES =
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libzakform_la_SOURCES) $(gir_include)
+
+ZakForm-1.0.gir: libzakform.la
+ZakForm_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 GModule-2.0 libxml2-2.0
+ZakForm_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+ZakForm_1_0_gir_LIBS = libzakform.la
+ZakForm_1_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += ZakForm-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif

diff --git a/src/formelement.c b/src/formelement.c
index eb9a60158494e481a3404c8022c39ab9dde0f1e4..7d5f204f2ca44e24c09d3b008e8c0ce3a3cbb589 100644 (file)
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -941,7 +941,7 @@ zak_form_element_set_default_value (ZakFormElement *element, const gchar *value)
 }
 
 /**
- * zak_form_element_get_default_value_gvalue:
+ * zak_form_element_get_default_value:
  * @element:
  *
  */