[telepathy-salut/master] gibber_fd_transport_block_receiving; don't crash when trying to unblock a not yet connected transport

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Jun 1 03:35:53 PDT 2009


---
 lib/gibber/gibber-fd-transport.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c
index 8babcfc..4837c11 100644
--- a/lib/gibber/gibber-fd-transport.c
+++ b/lib/gibber/gibber-fd-transport.c
@@ -517,8 +517,12 @@ gibber_fd_transport_block_receiving (GibberTransport *transport,
   else if (!block && priv->watch_in == 0)
     {
       DEBUG ("unblock receiving from the transport");
-      priv->watch_in = g_io_add_watch (priv->channel, G_IO_IN,
-          _channel_io_in, self);
+      if (priv->channel != NULL)
+        {
+          priv->watch_in = g_io_add_watch (priv->channel, G_IO_IN,
+              _channel_io_in, self);
+        }
+      /* else the transport isn't connected yet */
     }
 
   priv->receiving_blocked = block;
-- 
1.5.6.5



More information about the telepathy-commits mailing list