0a161d2235
Update to 3.1.90 OBS-URL: https://build.opensuse.org/request/show/80756 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=103
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
Index: evolution-data-server-3.1.90/libedataserver/e-data-server-util.c
|
|
===================================================================
|
|
--- evolution-data-server-3.1.90.orig/libedataserver/e-data-server-util.c
|
|
+++ evolution-data-server-3.1.90/libedataserver/e-data-server-util.c
|
|
@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *hay
|
|
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;
|
|
}
|
|
|