diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-11 17:03:37 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-11 17:03:37 +0100 |
| commit | 0f7c6618b75e381e310a85d8e50a0a6b0025fa13 (patch) | |
| tree | 5fb0013f98d64a92095b63ddc3194cd2b655c229 | |
| parent | 6c61c62e9e94f5ec55b199f04422ea00e7e7c597 (diff) | |
| parent | b3aa3ffb6683d92ccc4eeae8f8cb9c11e8eb4575 (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | telepathy-glib/connection-contact-info.c | 2 | ||||
| -rw-r--r-- | telepathy-glib/connection.h | 8 | ||||
| -rw-r--r-- | vala/Makefile.am | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3959dd5cd..edb47cf52 100644 --- a/configure.ac +++ b/configure.ac @@ -264,7 +264,7 @@ if test x$enable_vala_bindings = xyes; then AC_MSG_ERROR([GObject-Introspection must be enabled for Vala bindings]) fi - AM_PROG_VALAC([0.14.0]) + AM_PROG_VALAC([0.16.0]) have_vala=yes AC_PATH_PROG(VALAC, valac, valac) diff --git a/telepathy-glib/connection-contact-info.c b/telepathy-glib/connection-contact-info.c index 7fcbf32f2..7cdf1adf0 100644 --- a/telepathy-glib/connection-contact-info.c +++ b/telepathy-glib/connection-contact-info.c @@ -39,8 +39,6 @@ #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" - - /** * TpContactInfoFieldSpec: * @name: The name of the field; this is the lowercased name of a vCard diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h index e5db572ba..0bf3c6444 100644 --- a/telepathy-glib/connection.h +++ b/telepathy-glib/connection.h @@ -48,7 +48,11 @@ TpContactInfoFieldSpec *tp_contact_info_field_spec_copy ( const TpContactInfoFieldSpec *self); void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self); +#ifndef __GI_SCANNER__ +/* the typedef only exists for G_DEFINE_BOXED_TYPE's benefit, and + * g-ir-scanner 1.32.1 doesn't parse a skip annotation */ typedef GList TpContactInfoSpecList; +#endif #define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type ()) GType tp_contact_info_spec_list_get_type (void); @@ -73,7 +77,11 @@ TpContactInfoField *tp_contact_info_field_new (const gchar *field_name, TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *self); void tp_contact_info_field_free (TpContactInfoField *self); +#ifndef __GI_SCANNER__ +/* the typedef only exists for G_DEFINE_BOXED_TYPE's benefit, and + * g-ir-scanner 1.32.1 doesn't parse a skip annotation */ typedef GList TpContactInfoList; +#endif #define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ()) GType tp_contact_info_list_get_type (void); diff --git a/vala/Makefile.am b/vala/Makefile.am index faefefa91..8076076b7 100644 --- a/vala/Makefile.am +++ b/vala/Makefile.am @@ -15,6 +15,7 @@ pkgconfigdir = ${libdir}/pkgconfig telepathy-glib.vapi: $(top_builddir)/telepathy-glib/TelepathyGLib-0.12.gir $(VAPIGEN_V)$(VAPIGEN) \ --library telepathy-glib \ + --metadatadir=$(top_srcdir)/telepathy-glib \ --pkg gio-2.0 \ $< \ $(NULL) |