[telepathy-glib/master] TpConnection: if already invalidated, don't add interfaces or try to become ready

[Simon McVittie]

Reviewed-by: Will Thompson <will.thompson at collabora.co.uk>
---
 telepathy-glib/connection.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 854c86a..a299937 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -354,6 +354,13 @@ tp_connection_got_interfaces_cb (TpConnection *self,
 
   DEBUG ("%p: Introspected interfaces", self);
 
+  if (tp_proxy_get_invalidated (self) != NULL)
+    {
+      DEBUG ("%p: already invalidated, not trying to become ready: %s",
+          self, tp_proxy_get_invalidated (self)->message);
+      return;
+    }
+
   g_assert (self->priv->introspect_needed == NULL);
   self->priv->introspect_needed = g_array_new (FALSE, FALSE,
       sizeof (TpConnectionProc));
-- 
1.5.6.5