From d7b616d507aac744ae53d50bcab0ecf7deeb3fda Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 30 May 2017 09:43:23 -0700 Subject: [PATCH] Fix crash when notification is closed. "closed" signal callback function had incorrect signature. See #17876 --- src/gtk/notifmsg.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gtk/notifmsg.cpp b/src/gtk/notifmsg.cpp index 095c21465a..fce92ae6d6 100644 --- a/src/gtk/notifmsg.cpp +++ b/src/gtk/notifmsg.cpp @@ -92,8 +92,7 @@ void wxLibNotifyMsgImplActionCallback(NotifyNotification *notification, gpointer user_data); extern "C" { -static gboolean closed_notification(NotifyNotification *notification, - const char* WXUNUSED(data), void* user_data); +static void closed_notification(NotifyNotification* notification, void* user_data); } class wxLibNotifyMsgImpl : public wxNotificationMessageImpl @@ -352,13 +351,11 @@ void wxLibNotifyMsgImplActionCallback(NotifyNotification *WXUNUSED(notification) } extern "C" { -static gboolean closed_notification(NotifyNotification *notification, - const char* WXUNUSED(data), void* user_data) +static void closed_notification(NotifyNotification* notification, void* user_data) { wxLibNotifyMsgImpl* impl = (wxLibNotifyMsgImpl*) user_data; gint closeReason = notify_notification_get_closed_reason(notification); impl->NotifyClose(closeReason); - return true; } }