diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-20 13:13:39 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-20 13:13:39 +0100 |
| commit | efa2cfaf3c30a4425e3bf87e0a3f14dffd097e18 (patch) | |
| tree | a5d8c2356360d53410d37a3601e90d9dd5d836d2 | |
| parent | bbd3d16eb2d2d2fc3a343e5b64ce833484de65f3 (diff) | |
| parent | d8439319d0ea50ba29b0126a8c6574b817ad7836 (diff) | |
Merge branch 'telepathy-glib-0.8' into telepathy-glib-0.10
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | telepathy-glib/connection-handles.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,7 +1,10 @@ telepathy-glib 0.10.4 (UNRELEASED) ================================== -... +Fixes: + +* fd.o #27537: fix assertion failure if getting contact attributes + fails (cassidy) telepathy-glib 0.10.3 (2010-04-06) ================================== diff --git a/telepathy-glib/connection-handles.c b/telepathy-glib/connection-handles.c index aa40e8b07..c56ebb5e0 100644 --- a/telepathy-glib/connection-handles.c +++ b/telepathy-glib/connection-handles.c @@ -699,8 +699,9 @@ connection_got_contact_attributes (TpConnection *self, { GetContactAttributesContext *c = user_data; - DEBUG ("%u handles, hold=%c", g_hash_table_size (attributes), - c->hold ? 'T' : 'F'); + if (error == NULL) + DEBUG ("%u handles, hold=%c", g_hash_table_size (attributes), + c->hold ? 'T' : 'F'); if (error == NULL && c->hold) { |