[gnome-utils] Fix the build with GLib >= 2.29.14
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-utils] Fix the build with GLib >= 2.29.14
- Date: Sun, 24 Jul 2011 02:55:29 +0000 (UTC)
commit f8cb443db69cd71b7557536c39948a2af021b413
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jul 23 22:53:58 2011 -0400
Fix the build with GLib >= 2.29.14
G_UNICODE_COMBINING_MARK has been deprecated in favor
of the official Unicode name, G_UNICODE_SPACING_MARK.
gnome-dictionary/libgdict/gdict-defbox.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/gnome-dictionary/libgdict/gdict-defbox.c b/gnome-dictionary/libgdict/gdict-defbox.c
index 93223b1..0b41907 100644
--- a/gnome-dictionary/libgdict/gdict-defbox.c
+++ b/gnome-dictionary/libgdict/gdict-defbox.c
@@ -379,9 +379,16 @@ exact_prefix_cmp (const gchar *string,
/* If string contains prefix, check that prefix is not followed
* by a unicode mark symbol, e.g. that trailing 'a' in prefix
* is not part of two-char a-with-hat symbol in string. */
+
+#if GLIB_CHECK_VERSION(2, 29, 14)
+ return type != G_UNICODE_SPACING_MARK &&
+ type != G_UNICODE_ENCLOSING_MARK &&
+ type != G_UNICODE_NON_SPACING_MARK;
+#else
return type != G_UNICODE_COMBINING_MARK &&
type != G_UNICODE_ENCLOSING_MARK &&
type != G_UNICODE_NON_SPACING_MARK;
+#endif
}
static const gchar *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]