[evolution] Bug 657836 - Work around g_unix_signal API changes.



commit 3e3860e0ecc9f330c7c0df143641a01073ad976c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Aug 31 12:30:56 2011 -0400

    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 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/shell/main.c b/shell/main.c
index 95dc1b9..8e1d533 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);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]