[Bug 29796] Extract some non-Gabble-specific base classes for Call-related objects

[bugzilla-daemon at freedesktop.org]

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

--- Comment #6 from Will Thompson <will.thompson at collabora.co.uk> 2010-12-16 12:01:17 PST ---
(In reply to comment #4)
> Branch looks good. Had a go at doing the merge, but it's non-trivial thanks to
> dtmf lalaing. I posted to alsuren/call-base-classes-merged if anyone wants to
> take a look.

  G_DEFINE_TYPE_WITH_CODE(GabbleBaseCallChannel, gabble_base_call_channel,
-   G_TYPE_OBJECT,
-   G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
+   TP_TYPE_BASE_CHANNEL,
    G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_TYPE_CALL,
 -        call_iface_init)
 +        call_iface_init);
 +  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
 +    tp_dbus_properties_mixin_iface_init);
 +  G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
 +  G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
 +  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF,
 +      dtmf_iface_init);
- 
  );

This looks suspicious. It looks like the merge has restored a whole bunch of
interfaces that BaseChannel does for us. Otherwise the merge looks fine (even
if you do want to defer it :)).

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.