diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-09-30 00:05:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-09-30 00:05:49 +0800 |
| commit | 3d98af62e582b48fe9c23c8f6e2397911cbce27c (patch) | |
| tree | 2b90f76ed1dc43d637784509217890f2692a12db /shell | |
| parent | f8e6c60b2facac19916b72323ce78dbfa137d00c (diff) | |
| download | gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.tar gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.tar.gz gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.tar.bz2 gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.tar.lz gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.tar.xz gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.tar.zst gsoc2013-evolution-3d98af62e582b48fe9c23c8f6e2397911cbce27c.zip | |
Require GLib 2.30.
Drop all GLIB_CHECK_VERSION macros.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/main.c | 10 |
1 files changed, 0 insertions, 10 deletions
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) { |