summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-10-20 15:04:24 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-10-24 16:33:06 +0200
commit6bf59dec6b50af267f56eeb7980476919a1dd92d (patch)
tree7339658e13ea9fc051283e4003bb41b5f5f8521b
parentdf26d5592ec8fc2ff026f30c562f3e5102263c65 (diff)
downloadtelepathy-glib-6bf59dec6b50af267f56eeb7980476919a1dd92d.tar.gz
Let TpTestsNoRequestsConnection return an empty RCC
If we don't implement Requests we shouldn't respond to the retrieval of RCC properties. Unfortunately that's tricky to do, so do a quick hack which means we will have an empty RCC property, which is at least somewhat more useful for our tests.
-rw-r--r--tests/lib/contacts-conn.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c
index 82eb23212..1d1b5ee1c 100644
--- a/tests/lib/contacts-conn.c
+++ b/tests/lib/contacts-conn.c
@@ -362,6 +362,7 @@ client_types_fill_contact_attributes (
static void
constructed (GObject *object)
{
+ TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (object);
TpBaseConnection *base = TP_BASE_CONNECTION (object);
void (*parent_impl) (GObject *) =
G_OBJECT_CLASS (tp_tests_contacts_connection_parent_class)->constructed;
@@ -372,7 +373,8 @@ constructed (GObject *object)
tp_contacts_mixin_init (object,
G_STRUCT_OFFSET (TpTestsContactsConnection, contacts_mixin));
tp_base_connection_register_with_contacts_mixin (base);
- tp_base_contact_list_mixin_register_with_contacts_mixin (base);
+ if (self->priv->list_manager)
+ tp_base_contact_list_mixin_register_with_contacts_mixin (base);
tp_contacts_mixin_add_contact_attributes_iface (object,
TP_IFACE_CONNECTION_INTERFACE_ALIASING,
aliasing_fill_contact_attributes);
@@ -1346,4 +1348,5 @@ tp_tests_no_requests_connection_class_init (
(TpBaseConnectionClass *) klass;
base_class->interfaces_always_present = interfaces_always_present;
+ base_class->create_channel_managers = NULL;
}