aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-09-01 00:30:56 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-09-14 20:08:58 +0800
commit508f6cf941d40ad55e15a76e2c90dbef4ac72509 (patch)
treec9562e7fbf7bd7e3d4c457f52b8cdd9c0116bbe6 /shell
parentf9c8277b9e9fd0f4f0ed2db898d1ea4e119c1137 (diff)
downloadgsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.tar
gsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.tar.gz
gsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.tar.bz2
gsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.tar.lz
gsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.tar.xz
gsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.tar.zst
gsoc2013-evolution-508f6cf941d40ad55e15a76e2c90dbef4ac72509.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.
Diffstat (limited to 'shell')
-rw-r--r--shell/main.c6
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);