diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-09-01 00:30:56 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-09-01 00:30:56 +0800 |
| commit | 3e3860e0ecc9f330c7c0df143641a01073ad976c (patch) | |
| tree | 709cbdabcd4497edc36c70fec151dc3124aea133 | |
| parent | bb5984a6ef26f4f580b66f9ae1732c2e8721f355 (diff) | |
| download | gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.tar gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.tar.gz gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.tar.bz2 gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.tar.lz gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.tar.xz gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.tar.zst gsoc2013-evolution-3e3860e0ecc9f330c7c0df143641a01073ad976c.zip | |
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.
| -rw-r--r-- | shell/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |