From 508f6cf941d40ad55e15a76e2c90dbef4ac72509 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 31 Aug 2011 12:30:56 -0400 Subject: Bug 657836 - Work around g_unix_signal API changes. Work around GLib API churn with regard to registering UNIX signal callbacks on the main loop. GLib >= 2.29.5 calls the function one thing, GLib >= 2.29.19 calls it another. --- shell/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/main.c b/shell/main.c index 95dc1b9ff4..8e1d533546 100644 --- a/shell/main.c +++ b/shell/main.c @@ -613,7 +613,11 @@ main (gint argc, gchar **argv) } #ifdef G_OS_UNIX -#if GLIB_CHECK_VERSION(2,29,5) +#if GLIB_CHECK_VERSION(2,29,19) + g_unix_signal_add_full ( + G_PRIORITY_DEFAULT, SIGTERM, + handle_term_signal, NULL, NULL); +#elif GLIB_CHECK_VERSION(2,29,5) g_unix_signal_add_watch_full ( SIGTERM, G_PRIORITY_DEFAULT, handle_term_signal, NULL, NULL); -- cgit v1.2.3