diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-11 16:49:56 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-11 17:02:19 +0100 |
| commit | d4abcf3999ee5141805ab70bf925983b336d49f3 (patch) | |
| tree | ffc21c22706a3f245c1eebcb505e9820966284a7 | |
| parent | 9e087fa03ff6c6b1cf6405750dd5561b42831cab (diff) | |
Hide GList-based contact info typedefs from g-ir-scanner
Recent vapigen versions don't like the result.
This means we can revert the version that adds stub doc-comments for
them, which seems to confuse gtk-doc. Good thing we don't have several
duelling C-and-comment parsers or anything...
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49637
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
| -rw-r--r-- | telepathy-glib/connection-contact-info.c | 8 | ||||
| -rw-r--r-- | telepathy-glib/connection.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/telepathy-glib/connection-contact-info.c b/telepathy-glib/connection-contact-info.c index 9a48204a4..52179e35f 100644 --- a/telepathy-glib/connection-contact-info.c +++ b/telepathy-glib/connection-contact-info.c @@ -135,10 +135,6 @@ tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self) } /** - * TpContactInfoSpecList: (skip) - */ - -/** * TP_TYPE_CONTACT_INFO_FIELD_SPEC: * * The boxed type of a #TpContactInfoFieldSpec. @@ -189,10 +185,6 @@ tp_contact_info_spec_list_free (GList *list) } /** - * TpContactInfoList: (skip) - */ - -/** * TP_TYPE_CONTACT_INFO_SPEC_LIST: * * The boxed type of a #GList of #TpContactInfoFieldSpec. diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h index 04506c02e..b5af72b0f 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); |