diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-08-29 08:50:38 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-08-29 08:51:18 -0400 |
| commit | 6cc857aa6648b17e70b1b2b13a4e8b7a74a4a240 (patch) | |
| tree | 48c686f585241b09a89ea195c52b4e766c9acb7f /pango/pango-markup.c | |
| parent | cce034fea4187ce02577dbc6d92c8b1042aca815 (diff) | |
| download | pango-6cc857aa6648b17e70b1b2b13a4e8b7a74a4a240.tar.gz | |
Avoid deprecation warnings
Now that we're using new-style deprecations, we have to fight
a little harder to get rid of them inside pango.
Diffstat (limited to 'pango/pango-markup.c')
| -rw-r--r-- | pango/pango-markup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pango/pango-markup.c b/pango/pango-markup.c index b4fe881e..c174736d 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -28,6 +28,7 @@ #include "pango-font.h" #include "pango-enum-types.h" #include "pango-impl-utils.h" +#include "pango-utils-internal.h" /* FIXME */ #define _(x) x @@ -952,7 +953,7 @@ span_parse_int (const char *attr_name, { const char *end = attr_val; - if (!pango_scan_int (&end, val) || *end != '\0') + if (!_pango_scan_int (&end, val) || *end != '\0') { g_set_error (error, G_MARKUP_ERROR, @@ -1037,7 +1038,7 @@ span_parse_alpha (const char *attr_name, const char *end = attr_val; int int_val; - if (pango_scan_int (&end, &int_val)) + if (_pango_scan_int (&end, &int_val)) { if (*end == '\0' && int_val > 0 && int_val <= 0xffff) { @@ -1087,7 +1088,7 @@ span_parse_enum (const char *attr_name, { char *possible_values = NULL; - if (!pango_parse_enum (type, attr_val, val, FALSE, &possible_values)) + if (!_pango_parse_enum (type, attr_val, val, FALSE, &possible_values)) { g_set_error (error, G_MARKUP_ERROR, @@ -1261,7 +1262,7 @@ span_parse_func (MarkupData *md G_GNUC_UNUSED, const char *end; gint n; - if ((end = size, !pango_scan_int (&end, &n)) || *end != '\0' || n < 0) + if ((end = size, !_pango_scan_int (&end, &n)) || *end != '\0' || n < 0) { g_set_error (error, G_MARKUP_ERROR, |