aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2010-07-16 01:32:10 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-16 16:57:48 +0800
commit90d81c0c42cdc99642e7191be01a907cc1b2c852 (patch)
tree7d357fdbb7698fbfb7e7c29d8a2f3242b729a9ab
parent447bd35e4e5ff25cdbeda0d5273e11606d7f45c1 (diff)
downloadgsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.tar
gsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.tar.gz
gsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.tar.bz2
gsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.tar.lz
gsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.tar.xz
gsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.tar.zst
gsoc2013-empathy-90d81c0c42cdc99642e7191be01a907cc1b2c852.zip
avoid segfault in event_manager_add (#624462)
Check if approval is not NULL before trying to modify it
-rw-r--r--src/empathy-event-manager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 35d71f943..bf3a48a8a 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -241,7 +241,9 @@ event_manager_add (EmpathyEventManager *manager,
if (!display_notify_area ())
{
/* Don't fire the 'event-added' signal as we activate the event now */
- approval->auto_approved = TRUE;
+ if (approval != NULL)
+ approval->auto_approved = TRUE;
+
empathy_event_activate (&event->public);
return;
}