aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-10 19:47:56 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-10 19:56:57 +0800
commitc8beb5910b162e26e94c13a57d7d3213f9a3ef84 (patch)
treec3f84a1ae58fbb24cd1be7ec0db66d48fce89529
parent65fac9c002b47ba0c8a3e4e0d6c4fa9494b2f771 (diff)
downloadgsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.tar
gsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.tar.gz
gsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.tar.bz2
gsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.tar.lz
gsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.tar.xz
gsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.tar.zst
gsoc2013-empathy-c8beb5910b162e26e94c13a57d7d3213f9a3ef84.zip
Cope with tpl_event_get_receiver() returning NULL
-rw-r--r--libempathy-gtk/empathy-log-window.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index ef004b40c..eee79ffb2 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -611,6 +611,9 @@ is_same_confroom (TplEvent *e1,
TplEntity *receiver2 = tpl_event_get_receiver (e2);
TplEntity *room1, *room2;
+ if (receiver1 == NULL || receiver2 == NULL)
+ return FALSE;
+
if (tpl_entity_get_entity_type (sender1) == TPL_ENTITY_ROOM)
room1 = sender1;
else if (tpl_entity_get_entity_type (receiver1) == TPL_ENTITY_ROOM)