diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-16 16:38:12 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-16 17:46:18 +0000 |
| commit | cfba7302281f1fbb39a0c5864bcc038bab2ed55b (patch) | |
| tree | cf5bbcf6f6d7aae82447071d2c647b7a82129dd3 /telepathy-glib/basic-proxy-factory.c | |
| parent | 673fb97c61b11e984c88240773b4fa72f9a1466c (diff) | |
| download | telepathy-glib-cfba7302281f1fbb39a0c5864bcc038bab2ed55b.tar.gz | |
fd.o #31631: fix confusion between TpClientChannelFactory and TpClientChannelFactoryInterface
The former (which didn't previously have a typedef) is a GObject which
implements TP_TYPE_CLIENT_CHANNEL_FACTORY. The latter is the vtable
struct for that interface (i.e. it's a class-like structure).
This is an API break (for anyone who was using channel factories, which
are relatively recent), but not an ABI break.
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'telepathy-glib/basic-proxy-factory.c')
| -rw-r--r-- | telepathy-glib/basic-proxy-factory.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/telepathy-glib/basic-proxy-factory.c b/telepathy-glib/basic-proxy-factory.c index 83c184645..a916d0996 100644 --- a/telepathy-glib/basic-proxy-factory.c +++ b/telepathy-glib/basic-proxy-factory.c @@ -58,11 +58,9 @@ #define DEBUG_FLAG TP_DEBUG_CLIENT #include "telepathy-glib/debug-internal.h" -static void client_channel_factory_iface_init (gpointer, gpointer); - +/* We rely on the default (lack of) implementation of everything */ G_DEFINE_TYPE_WITH_CODE(TpBasicProxyFactory, tp_basic_proxy_factory, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (TP_TYPE_CLIENT_CHANNEL_FACTORY, - client_channel_factory_iface_init)) + G_IMPLEMENT_INTERFACE (TP_TYPE_CLIENT_CHANNEL_FACTORY, NULL)) static void tp_basic_proxy_factory_init (TpBasicProxyFactory *self) @@ -74,16 +72,6 @@ tp_basic_proxy_factory_class_init (TpBasicProxyFactoryClass *cls) { } -static void -client_channel_factory_iface_init (gpointer g_iface, - gpointer unused G_GNUC_UNUSED) -{ - TpClientChannelFactoryInterface *iface = g_iface; - - /* We rely on the default implementation of create_channel */ - iface->create_channel = NULL; -} - /** * tp_basic_proxy_factory_new: * |