From 3af40c204dab8fbd3bec0dceb7cbed0896178a4b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 21 Jul 2011 10:30:36 -0400 Subject: [PATCH] Bug 655025 - #define G_UNICODE_SPACING_MARK G_UNICODE_COMBINING_MARK --- glib/gunicode.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/glib/gunicode.h b/glib/gunicode.h index 1df52849c..283b4db2f 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -90,7 +90,7 @@ typedef guint16 gunichar2; * @G_UNICODE_OTHER_LETTER: General category "Letter, Other" (Lo) * @G_UNICODE_TITLECASE_LETTER: General category "Letter, Titlecase" (Lt) * @G_UNICODE_UPPERCASE_LETTER: General category "Letter, Uppercase" (Lu) - * @G_UNICODE_COMBINING_MARK: General category "Mark, Spacing Combining" (Mc) + * @G_UNICODE_SPACING_MARK: General category "Mark, Spacing" (Mc) * @G_UNICODE_ENCLOSING_MARK: General category "Mark, Enclosing" (Me) * @G_UNICODE_NON_SPACING_MARK: General category "Mark, Nonspacing" (Mn) * @G_UNICODE_DECIMAL_NUMBER: General category "Number, Decimal Digit" (Nd) @@ -127,7 +127,7 @@ typedef enum G_UNICODE_OTHER_LETTER, G_UNICODE_TITLECASE_LETTER, G_UNICODE_UPPERCASE_LETTER, - G_UNICODE_COMBINING_MARK, + G_UNICODE_SPACING_MARK, G_UNICODE_ENCLOSING_MARK, G_UNICODE_NON_SPACING_MARK, G_UNICODE_DECIMAL_NUMBER, @@ -149,6 +149,15 @@ typedef enum G_UNICODE_SPACE_SEPARATOR } GUnicodeType; +/** + * G_UNICODE_COMBINING_MARK: + * + * Older name for %G_UNICODE_SPACING_MARK. + * + * Deprecated: 2.30: Use %G_UNICODE_SPACING_MARK. + */ +#define G_UNICODE_COMBINING_MARK G_UNICODE_SPACING_MARK + /** * GUnicodeBreakType: * @G_UNICODE_BREAK_MANDATORY: Mandatory Break (BK)