summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Dasmohapatra <vivek@collabora.co.uk>2011-05-19 15:25:43 +0100
committerVivek Dasmohapatra <vivek@collabora.co.uk>2011-05-30 11:24:01 +0100
commit34a28b406627f4452807b27ee87760b7b93d4bad (patch)
treeebb612f4c93688d8df343bdb82ff8eb691fd98d4
parent9a0990b433fe9a90b1373c8aacaa5501d905f817 (diff)
downloadtelepathy-mission-control-34a28b406627f4452807b27ee87760b7b93d4bad.tar.gz
Don't call tp_intset_size on unset intset
-rw-r--r--src/mcd-connection.c5
1 files changed, 4 insertions, 1 deletions
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)