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

[Matthew Barnes <mbarnes src gnome org>]

commit e318b8164aa52b804057c35ccfea49bfb06ed77c
Author: Denis Washington <denisw online de>
Date:   Wed Aug 31 12:27:08 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.

 addressbook/libedata-book/e-data-book-factory.c |    6 +++++-
 calendar/libedata-cal/e-data-cal-factory.c      |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index d0a4546..f53ddf8 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -844,7 +844,11 @@ main (gint argc, gchar **argv)
 	e_data_book_migrate_basedir ();
 
 #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);
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 32771e1..d1f63b4 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -1070,7 +1070,11 @@ main (gint argc, gchar **argv)
 	e_data_cal_migrate_basedir ();
 
 #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);