Attachment 71450 Details for Bug 58247 – introspection build fix

introspection build fix

0001-Update-annotations-for-newer-g-ir-scanner.patch (text/plain), 2.13 KB, created by Colin Walters on 2012-12-13 15:48:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2012-12-13 15:48:27 UTC

Size: 2.13 KB

patch

obsolete

>From c4767887e316020a1a7a1c2bba8e9f729d7daf2e Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Thu, 13 Dec 2012 10:37:01 -0500
>Subject: [PATCH] Update annotations for newer g-ir-scanner
>
>The scanner has always marked methods with GArray/GPtrArray that have
>missing (element-type) as introspectable=0, but now it also emits a
>warning.  This causes a build failure.
>
>For the one method that is easy to add an (element-type) do so.  The
>other two use the dbus-glib boxed types unfortunately.
>
>See https://bugzilla.gnome.org/show_bug.cgi?id=689998
>---
> telepathy-glib/capabilities.c           | 2 +-
> telepathy-glib/client-channel-factory.c | 2 +-
> telepathy-glib/dbus.c                   | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c
>index ae1d34f..c76845c 100644
>--- a/telepathy-glib/capabilities.c
>+++ b/telepathy-glib/capabilities.c
>@@ -79,7 +79,7 @@ struct _TpCapabilitiesPrivate {
> };
> 
> /**
>- * tp_capabilities_get_channel_classes:
>+ * tp_capabilities_get_channel_classes: (skip)
>  * @self: a #TpCapabilities object
>  *
>  * 
>diff --git a/telepathy-glib/client-channel-factory.c b/telepathy-glib/client-channel-factory.c
>index c5d3cf4..e131b2b 100644
>--- a/telepathy-glib/client-channel-factory.c
>+++ b/telepathy-glib/client-channel-factory.c
>@@ -139,7 +139,7 @@ tp_client_channel_factory_create_channel (TpClientChannelFactory *self,
>  * it expected an object instance as its first parameter, but the type of the
>  * parameter was the type of the interface vtable.
>  *
>- * Returns: (transfer full): a newly allocated #GArray
>+ * Returns: (transfer full) (element-type GObject.Quark): a newly allocated #GArray
>  *
>  * Since: 0.13.3
>  */
>diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
>index 04ba84b..93b14ac 100644
>--- a/telepathy-glib/dbus.c
>+++ b/telepathy-glib/dbus.c
>@@ -866,7 +866,7 @@ tp_asv_set_boolean (GHashTable *asv,
> }
> 
> /**
>- * tp_asv_get_bytes:
>+ * tp_asv_get_bytes: (skip)
>  * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are
>  * strings and the values are GValues
>  * @key: The key to look up
>-- 
>1.7.11.7
>

Actions: View

Attachments on bug 58247: 71450

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.