[empathy] event_manager_add: don't crash if approval is NULL (#646555)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] event_manager_add: don't crash if approval is NULL (#646555)
- Date: Thu, 30 Jun 2011 08:50:13 +0000 (UTC)
commit 19cbd39e5eb916ecc4dc2f0705a204d0c7ca6e3a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Apr 4 10:23:53 2011 +0200
event_manager_add: don't crash if approval is NULL (#646555)
When adding a "subscription request" event there is no EventManagerApproval
associated with the event.
src/empathy-event-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index dbb95cd..27f8a0b 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -237,7 +237,8 @@ event_manager_add (EmpathyEventManager *manager,
event->public.header = g_strdup (header);
event->public.message = g_strdup (message);
event->public.must_ack = (func != NULL);
- event->public.handler_instance = approval->handler_instance;
+ if (approval != NULL)
+ event->public.handler_instance = approval->handler_instance;
event->inhibit = FALSE;
event->func = func;
event->user_data = user_data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]