diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-07 11:55:28 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-07 11:55:28 +0000 |
| commit | 12e8b215512e99b8f11a2800b8f9842c59dd38d6 (patch) | |
| tree | 3a7a863d79619bc39ff1a50b8c494cb39449bac8 | |
| parent | 308408b98358b701a629b2b7821af81eaecc0239 (diff) | |
| parent | a0f0298c9a2c6b69c7a1d6f6098fc20be4b82483 (diff) | |
| download | telepathy-glib-12e8b215512e99b8f11a2800b8f9842c59dd38d6.tar.gz | |
Merge branch 'telepathy-glib-0.18' into telepathy-glib-0.20
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | telepathy-glib/connection-contact-list.c | 6 |
2 files changed, 10 insertions, 0 deletions
@@ -3,6 +3,10 @@ telepathy-glib 0.20.2 (UNRELEASED) Fixes: +• In TpSimpleClientFactory, don't crash when ensuring a contact for an + obsolete connection manager without "immortal handles" fails + (Maksim Melnikau) + • Add missing (element-type) introspection annotations to tp_capabilities_get_channel_classes, tp_asv_get_bytes and tp_client_channel_factory_dup_channel_features (fd.o #58851, Philip Withnall) diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c index 4d53dfe7f..f00f2308c 100644 --- a/telepathy-glib/connection-contact-list.c +++ b/telepathy-glib/connection-contact-list.c @@ -255,6 +255,12 @@ got_contact_list_attributes_cb (TpConnection *self, contact = tp_simple_client_factory_ensure_contact ( tp_proxy_get_factory (self), self, handle, id); + + /* ensure_contact() can fail for obsolete CMs that don't have + * ImmortalHandles */ + if (contact == NULL) + continue; + if (!_tp_contact_set_attributes (contact, value, features->len, (TpContactFeature *) features->data, &e)) { |