[telepathy-glib/master] Don't hold handles if GetContactAttributes fails

Will Thompson will.thompson at collabora.co.uk
Tue Apr 7 04:55:13 PDT 2009


Calling _tp_connection_ref_handles on an invalidated connection (which
self will be here if error is non-NULL) asserts.

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
---
 telepathy-glib/connection-handles.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/connection-handles.c b/telepathy-glib/connection-handles.c
index 395b1d6..350eb7c 100644
--- a/telepathy-glib/connection-handles.c
+++ b/telepathy-glib/connection-handles.c
@@ -695,7 +695,7 @@ connection_got_contact_attributes (TpConnection *self,
   DEBUG ("%u handles, hold=%c", g_hash_table_size (attributes),
       c->hold ? 'T' : 'F');
 
-  if (c->hold)
+  if (error == NULL && c->hold)
     {
       GHashTableIter iter;
       gpointer key, value;
-- 
1.5.6.5



More information about the telepathy-commits mailing list