diff options
| author | Michael Catanzaro <mcatanzaro@posteo.net> | 2019-05-27 13:21:38 +0000 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@posteo.net> | 2019-05-27 13:21:38 +0000 |
| commit | aaf44b08dd619e545e12ef0c106e5685b68233c3 (patch) | |
| tree | 8a0999ddcf0e687550a297c3960b05bfbf8b216a /pango/pango-context.c | |
| parent | 119b868619184fb46961ae63a440fe72bad4c7b1 (diff) | |
| download | pango-aaf44b08dd619e545e12ef0c106e5685b68233c3.tar.gz | |
Revert "Replace PangoScript by GUnicodeScript"
This reverts commit 3e754defc364a89b2136894399b3463976840156
Diffstat (limited to 'pango/pango-context.c')
| -rw-r--r-- | pango/pango-context.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index 6f90e388..e21b490f 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -1447,11 +1447,11 @@ string_from_script (PangoScript script) static GEnumClass *class = NULL; /* MT-safe */ GEnumValue *value; if (g_once_init_enter (&class)) - g_once_init_leave (&class, (gpointer)g_type_class_ref (G_TYPE_UNICODE_SCRIPT)); + g_once_init_leave(&class, (gpointer)g_type_class_ref (PANGO_TYPE_SCRIPT)); value = g_enum_get_value (class, script); if (!value) - return string_from_script (G_UNICODE_SCRIPT_INVALID_CODE); + return string_from_script (PANGO_SCRIPT_INVALID_CODE); return value->value_nick; } @@ -1536,11 +1536,9 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS script_name); G_GNUC_END_IGNORE_DEPRECATIONS - g_object_set_data_full (G_OBJECT (fontmap), script_name, - GINT_TO_POINTER (1), NULL); + g_object_set_data_full (G_OBJECT (fontmap), script_name, + GINT_TO_POINTER (1), NULL); } - else - g_free (script_name); shape_engine = _pango_get_fallback_shaper (); font = NULL; |