diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-05-25 17:28:34 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-05-25 17:28:34 +0000 |
| commit | 119b868619184fb46961ae63a440fe72bad4c7b1 (patch) | |
| tree | 633e420ff47761b3c3de6e19dc05c0680bbe566b /pango/pango-context.c | |
| parent | be0357359d975aa93d3683c5c5f4ea382b33ca5b (diff) | |
| parent | 6a2d2ce7852e9aca0dbc01f3a7594a048ce76240 (diff) | |
| download | pango-119b868619184fb46961ae63a440fe72bad4c7b1.tar.gz | |
Merge branch 'kill-pango-script' into 'master'
Replace PangoScript by GUnicodeScript
See merge request GNOME/pango!27
Diffstat (limited to 'pango/pango-context.c')
| -rw-r--r-- | pango/pango-context.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index e21b490f..6f90e388 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 (PANGO_TYPE_SCRIPT)); + g_once_init_leave (&class, (gpointer)g_type_class_ref (G_TYPE_UNICODE_SCRIPT)); value = g_enum_get_value (class, script); if (!value) - return string_from_script (PANGO_SCRIPT_INVALID_CODE); + return string_from_script (G_UNICODE_SCRIPT_INVALID_CODE); return value->value_nick; } @@ -1536,9 +1536,11 @@ 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; |