From 3d98af62e582b48fe9c23c8f6e2397911cbce27c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 29 Sep 2011 12:05:23 -0400
Subject: Require GLib 2.30.

Drop all GLIB_CHECK_VERSION macros.
---
 shell/main.c | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'shell')

diff --git a/shell/main.c b/shell/main.c
index fd0b0508e6..bb056e3ded 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -27,10 +27,8 @@
 #include <glib/gstdio.h>
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
 #include <glib-unix.h>
 #endif
-#endif
 
 #if HAVE_CLUTTER
 #include <clutter-gtk/clutter-gtk.h>
@@ -271,7 +269,6 @@ idle_cb (const gchar * const *uris)
 }
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
 static gboolean
 handle_term_signal (gpointer data)
 {
@@ -287,7 +284,6 @@ handle_term_signal (gpointer data)
 	return FALSE;
 }
 #endif
-#endif
 
 static GOptionEntry entries[] = {
 #ifdef G_OS_WIN32
@@ -614,15 +610,9 @@ main (gint argc,
 	}
 
 #ifdef G_OS_UNIX
-#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);
-#endif
 #endif
 
 	if (evolution_debug_log) {
-- 
cgit v1.2.3