Merge branch 'fix-glib-dependency' into 'master'

Don't depend on glib 2.60 symbols at runtime

See merge request GNOME/pango!141

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);