From 34a28b406627f4452807b27ee87760b7b93d4bad Mon Sep 17 00:00:00 2001
From: Vivek Dasmohapatra <vivek@collabora.co.uk>
Date: Thu, 19 May 2011 15:25:43 +0100
Subject: Don't call tp_intset_size on unset intset

---
 src/mcd-connection.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 9c50dce9..3aaf37cc 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -2854,7 +2854,10 @@ _mcd_connection_presence_info_is_ready (McdConnection *self)
 
 static void clear_emergency_handles (McdConnectionPrivate *priv)
 {
-  guint n_handles = tp_intset_size (priv->emergency.handles);
+  guint n_handles = 0;
+
+  if (priv->emergency.handles != NULL)
+    n_handles = tp_intset_size (priv->emergency.handles);
 
   /* trawl through the handles and unref them */
   if (n_handles > 0)
-- 
cgit v1.2.1