[evolution-data-server] Bug #655837 - Avoid use of deprecated g_unicode_canonical_decomposition

[Vincent Untz <vuntz src gnome org>]

commit f1c9292caa3b26c890d628e99677dd05d62eba99
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Sep 6 16:43:04 2011 +0200

    Bug #655837 - Avoid use of deprecated g_unicode_canonical_decomposition

 libedataserver/e-data-server-util.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index 4c0310a..3f2ff02 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *haystack,
 static gunichar
 stripped_char (gunichar ch)
 {
-	gunichar *decomp, retval;
+#if GLIB_CHECK_VERSION(2,29,12)
+	gunichar decomp[4];
+#else
+	gunichar *decomp;
+#endif
+	gunichar retval;
 	GUnicodeType utype;
 	gsize dlen;
 
@@ -268,11 +273,18 @@ 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;
 	}