From 643ae9f76c8ae044dcc8241adba5b8bf29e5f365 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 16 Sep 2013 14:01:27 +0200 Subject: [PATCH] connection: stop implementing old Presence interface https://bugs.freedesktop.org/show_bug.cgi?id=69413 --- src/connection.c | 3 --- tests/twisted/cm/protocol.py | 1 - 2 files changed, 4 deletions(-) diff --git a/src/connection.c b/src/connection.c index 395c906..4886414 100644 --- a/src/connection.c +++ b/src/connection.c @@ -110,8 +110,6 @@ G_DEFINE_TYPE_WITH_CODE(SalutConnection, TP_TYPE_BASE_CONNECTION, G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING, salut_connection_aliasing_service_iface_init); - G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE, - tp_presence_mixin_iface_init); G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_DBUS_PROPERTIES, tp_dbus_properties_mixin_iface_init); G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS, @@ -718,7 +716,6 @@ static const gchar *interfaces [] = { TP_IFACE_CONNECTION_INTERFACE_ALIASING, TP_IFACE_CONNECTION_INTERFACE_AVATARS, TP_IFACE_CONNECTION_INTERFACE_CONTACTS, - TP_IFACE_CONNECTION_INTERFACE_PRESENCE, TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE, TP_IFACE_CONNECTION_INTERFACE_REQUESTS, TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, diff --git a/tests/twisted/cm/protocol.py b/tests/twisted/cm/protocol.py index f4243c4..94bccac 100644 --- a/tests/twisted/cm/protocol.py +++ b/tests/twisted/cm/protocol.py @@ -44,7 +44,6 @@ def test(q, bus, conn): assertContains(cs.CONN_IFACE_ALIASING, proto_props['ConnectionInterfaces']) assertContains(cs.CONN_IFACE_AVATARS, proto_props['ConnectionInterfaces']) assertContains(cs.CONN_IFACE_CONTACTS, proto_props['ConnectionInterfaces']) - assertContains(cs.CONN_IFACE_PRESENCE, proto_props['ConnectionInterfaces']) assertContains(cs.CONN_IFACE_SIMPLE_PRESENCE, proto_props['ConnectionInterfaces']) assertContains(cs.CONN_IFACE_REQUESTS, proto_props['ConnectionInterfaces']) -- 1.8.3.1