diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-04 16:23:53 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-04 16:23:53 +0800 |
| commit | 73d8a18c6def748d78e91f0dda1145771c620b53 (patch) | |
| tree | 0a1a86a6d981989335f157c6c7292f5b5b189749 | |
| parent | d30fab8f713da3ea3cd98926fa84695ede0f1472 (diff) | |
| download | gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.tar gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.tar.gz gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.tar.bz2 gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.tar.lz gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.tar.xz gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.tar.zst gsoc2013-empathy-73d8a18c6def748d78e91f0dda1145771c620b53.zip | |
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.
| -rw-r--r-- | 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 5b2174a55..041d22a18 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -233,7 +233,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; |