[empathy] avoid segfault in event_manager_add (#624462)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] avoid segfault in event_manager_add (#624462)
- Date: Fri, 16 Jul 2010 08:58:15 +0000 (UTC)
commit 90d81c0c42cdc99642e7191be01a907cc1b2c852
Author: Marc-Antoine Perennou <Marc-Antoine Perennou com>
Date: Thu Jul 15 19:32:10 2010 +0200
avoid segfault in event_manager_add (#624462)
Check if approval is not NULL before trying to modify it
src/empathy-event-manager.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 35d71f9..bf3a48a 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]