From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 29 Sep 2011 15:44:28 +0000 (-0400)
Subject: Require GLib 2.30.
X-Git-Tag: upstream/3.7.4~1545
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faef977626f9b35ca25ad06904a4bed14101d889;p=platform%2Fupstream%2Fevolution-data-server.git

Require GLib 2.30.

Drop all GLIB_CHECK_VERSION macros.
---

diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index dbdb87f..5f39c6f 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -2946,11 +2946,8 @@ fetch_attachments (ECalBackendSync *backend,
 			g_message ("DEBUG: attachment write failed.\n");
 		}
 
-#if GLIB_CHECK_VERSION(2,21,3)
 		g_mapped_file_unref (mapped_file);
-#else
-		g_mapped_file_free (mapped_file);
-#endif
+
 		if (fd != -1)
 			close (fd);
 		dest_url = g_filename_to_uri (dest_file, NULL, NULL);
diff --git a/configure.ac b/configure.ac
index 299f32c..9742f4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl Automake 1.11 - Silent Build Rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Package Versions
-m4_define([glib_minimum_version], [2.28])
+m4_define([glib_minimum_version], [2.30])
 m4_define([gtk_minimum_version], [3.0])
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([gnome_keyring_minimum_version], [2.20.1])
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index e03acff..e5269b3 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -251,11 +251,7 @@ e_util_utf8_strstrcase (const gchar *haystack,
 static gunichar
 stripped_char (gunichar ch)
 {
-#if GLIB_CHECK_VERSION(2,29,12)
 	gunichar decomp[4];
-#else
-	gunichar *decomp;
-#endif
 	gunichar retval;
 	GUnicodeType utype;
 	gsize dlen;
@@ -273,18 +269,10 @@ stripped_char (gunichar ch)
 		/* Convert to lowercase, fall through */
 		ch = g_unichar_tolower (ch);
 	case G_UNICODE_LOWERCASE_LETTER:
-#if GLIB_CHECK_VERSION(2,29,12)
 		if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
 			retval = decomp[0];
 			return retval;
 		}
-#else
-		if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
-			retval = decomp[0];
-			g_free (decomp);
-			return retval;
-		}
-#endif
 		break;
 	}
 
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index d4d3350..4e54e6f 100644
--- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -24,12 +24,6 @@
 #include <gtk/gtk.h>
 #endif
 
-#ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
-#include <glib-unix.h>
-#endif
-#endif
-
 #ifdef G_OS_WIN32
 #include <windows.h>
 #include <conio.h>