summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-03-02 12:44:34 +1100
committerRobert Ancell <robert.ancell@canonical.com>2012-03-02 12:44:34 +1100
commit02541f857b064fb8f8418fbffe91269235a888e3 (patch)
tree80f368585679990d29b65c6f8bac146626ed7402
parent58abdc2431e2d8aeb5056d75dd61c72bf852fa2d (diff)
downloadlightdm-git-02541f857b064fb8f8418fbffe91269235a888e3.tar.gz
Fix introspection bindings not containing any methods
-rw-r--r--NEWS1
-rw-r--r--liblightdm-gobject/Makefile.am10
-rw-r--r--liblightdm-gobject/user.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 5f7d8fec..6ba6f006 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Overview of changes in lightdm 1.0.8
* Fix object cleanup on exit
* Fix lightdm --debug not working on newer GLib
* Fix liblightdm-qt-1.pc linking against the wrong libraries
+ * Fix introspection bindings not containing any methods
Overview of changes in lightdm 1.0.7
diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am
index 174c30ee..93f190b8 100644
--- a/liblightdm-gobject/Makefile.am
+++ b/liblightdm-gobject/Makefile.am
@@ -1,7 +1,5 @@
lib_LTLIBRARIES = liblightdm-gobject-1.la
-CLEANFILES =
-
liblightdm_gobject_1_la_LDFLAGS = -export-symbols-regex \^lightdm_.*
liblightdm_gobject_1_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS)
liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \
@@ -34,14 +32,14 @@ liblightdm_gobject_1_la_SOURCES= \
if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
INTROSPECTION_GIRS = LightDM-1.gir
LightDM-1.gir: liblightdm-gobject-1.la
LightDM_1_gir_INCLUDES = GObject-2.0
-LightDM_1_gir_CFLAGS = $(INCLUDES) --identifier-prefix=LightDM
+LightDM_1_gir_CFLAGS = $(INCLUDES) --symbol-prefix=lightdm
LightDM_1_gir_LIBS = liblightdm-gobject-1.la
LightDM_1_gir_FILES = $(liblightdm_gobject_1_la_SOURCES)
@@ -59,6 +57,10 @@ dist_vapi_DATA = liblightdm-gobject-1.vapi
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = liblightdm-gobject-1.pc
+CLEANFILES = \
+ $(gir_DATA) \
+ $(typelib_DATA)
+
DISTCLEANFILES = \
Makefile.in \
$(pkgconfig_DATA) \
diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c
index 0e832073..50a78f64 100644
--- a/liblightdm-gobject/user.c
+++ b/liblightdm-gobject/user.c
@@ -130,7 +130,7 @@ static LightDMUserList *singleton = NULL;
*
* Get the user list.
*
- * Return value: (tranfer none): the #LightDMUserList
+ * Return value: (transfer none): the #LightDMUserList
**/
LightDMUserList *
lightdm_user_list_get_instance (void)