diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-08-26 18:56:44 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-08-26 18:56:44 +0000 |
commit | 2720ccade26cad2fcadc20a5168883fd7d827e31 (patch) | |
tree | 0a9c2508c85ce47e56defb5f95dcfef19313e0a2 /pango | |
parent | c71b3f01870bed81d979d00c36b47b0d0321169f (diff) | |
parent | ba21a3cb8f70566aac1cc3f5ed63a2d81c609630 (diff) | |
download | pango-2720ccade26cad2fcadc20a5168883fd7d827e31.tar.gz |
Merge branch 'fix-glib-dependency' into 'master'
Don't depend on glib 2.60 symbols at runtime
See merge request GNOME/pango!141
Diffstat (limited to 'pango')
-rw-r--r-- | pango/pango-context.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index 99fa454a..a64eb79f 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -1488,17 +1488,19 @@ itemize_state_process_run (ItemizeState *state) { /* If no font was found, warn once per fontmap/script pair */ PangoFontMap *fontmap = state->context->font_map; - const char *script_name = g_enum_to_string (G_TYPE_UNICODE_SCRIPT, state->script); + char *script_tag = g_strdup_printf ("g-unicode-script-%d", state->script); - if (!g_object_get_data (G_OBJECT (fontmap), script_name)) + if (!g_object_get_data (G_OBJECT (fontmap), script_tag)) { - g_warning ("failed to choose a font, expect ugly output. script='%s'", - script_name); + g_warning ("failed to choose a font, expect ugly output. script='%d'", + state->script); - g_object_set_data_full (G_OBJECT (fontmap), script_name, + g_object_set_data_full (G_OBJECT (fontmap), script_tag, GINT_TO_POINTER (1), NULL); } + g_free (script_tag); + font = NULL; } itemize_state_fill_font (state, font); |