[Bug 70377] [1.0] don't strip ABI versions from interface names

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=70377

--- Comment #20 from Simon McVittie <simon.mcvittie at collabora.co.uk> ---
Comment on attachment 88113
  --> https://bugs.freedesktop.org/attachment.cgi?id=88113
[gabble] Adapt for use of ABI versions in generated code

Review of attachment 88113:
 --> (https://bugs.freedesktop.org/page.cgi?id=splinter.html&bug=70377&attachment=88113)
-----------------------------------------------------------------

Gabble in "rather large" shock...

Looks good.

::: src/conn-aliasing.c
@@ +1053,4 @@
>        g_value_take_string (val, alias);
>  
>        tp_contacts_mixin_set_contact_attribute (attributes_hash,
> +        handle, TP_IFACE_CONNECTION_INTERFACE_ALIASING1"/alias",

Definitely not a blocker (quite the opposite: please merge first!) but it would
be good to grep these projects for "/alias" and use
TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS.

::: src/conn-avatars.c
@@ +612,4 @@
>              g_value_set_string (val, "");
>  
>            tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
> +            TP_IFACE_CONNECTION_INTERFACE_AVATARS1"/token", val);

... and grep for "/token" too

::: src/conn-client-types.c
@@ +148,4 @@
>        val = tp_g_value_slice_new_take_boxed (G_TYPE_STRV, types);
>  
>        tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
> +          TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1 "/client-types", val);

... and "/client-types"

::: src/conn-contact-info.c
@@ +1057,4 @@
>                        TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
>  
>                tp_contacts_mixin_set_contact_attribute (attributes_hash,
> +                      contact, TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1"/info",

... and "/info"

::: src/conn-location.c
@@ +622,4 @@
>                TP_HASH_TYPE_STRING_VARIANT_MAP, location);
>  
>            tp_contacts_mixin_set_contact_attribute (attributes_hash,
> +              handle, TP_IFACE_CONNECTION_INTERFACE_LOCATION1"/location", val);

and "/location"

::: src/connection.c
@@ +3429,4 @@
>  
>        tp_contacts_mixin_set_contact_attribute (attributes_hash,
>            handle,
> +          TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1"/capabilities",

this too

::: src/media-factory.c
@@ +840,4 @@
>    if (G_UNLIKELY (qc_gtalk_p2p == 0))
>      {
>        qc_gtalk_p2p = g_quark_from_static_string (
> +          TP_IFACE_CHANNEL_TYPE_CALL1 "/gtalk-p2p");

I forget, do we have tokens for these too?

-- 
You are receiving this mail because:
You are the QA Contact for the bug.