aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--plugins/publish-calendar/publish-calendar.c8
-rw-r--r--shell/main.c10
3 files changed, 1 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 7c4c13feae..5d079c1726 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ dnl Automake 1.11 - Silent Build Rules
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl Required Packages
-m4_define([glib_minimum_version], [2.28])
+m4_define([glib_minimum_version], [2.30])
m4_define([gtk_minimum_version], [3.0.2])
m4_define([eds_minimum_version], [evo_version])
m4_define([gtkhtml_minimum_version], [4.1.2])
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index c55782985c..1ce9f17e41 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -252,11 +252,7 @@ unmount_done_cb (GObject *source_object,
{
GError *error = NULL;
-#if GLIB_CHECK_VERSION(2,21,3)
g_mount_unmount_with_operation_finish (G_MOUNT (source_object), result, &error);
-#else
- g_mount_unmount_finish (G_MOUNT (source_object), result, &error);
-#endif
if (error) {
g_warning ("Unmount failed: %s", error->message);
@@ -305,11 +301,7 @@ mount_ready_cb (GObject *source_object,
mount = g_file_find_enclosing_mount (G_FILE (source_object), NULL, NULL);
if (mount)
-#if GLIB_CHECK_VERSION(2,21,3)
g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, unmount_done_cb, NULL);
-#else
- g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE, NULL, unmount_done_cb, NULL);
-#endif
g_object_unref (source_object);
}
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) {