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-utils.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-utils.c')
-rw-r--r-- | pango/pango-utils.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/pango/pango-utils.c b/pango/pango-utils.c index c7c7d654..9bdc6f15 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -47,6 +47,7 @@ #include "pango-font.h" #include "pango-features.h" #include "pango-impl-utils.h" +#include "pango-utils-internal.h" #include <glib/gstdio.h> @@ -165,6 +166,12 @@ pango_version_check (int required_major, char * pango_trim_string (const char *str) { + return _pango_trim_string (str); +} + +char * +_pango_trim_string (const char *str) +{ int len; g_return_val_if_fail (str != NULL, NULL); @@ -202,7 +209,7 @@ pango_split_file_list (const char *str) while (files[i]) { - char *file = pango_trim_string (files[i]); + char *file = _pango_trim_string (files[i]); /* If the resulting file is empty, skip it */ if (file[0] == '\0') @@ -531,6 +538,12 @@ pango_scan_string (const char **pos, GString *out) gboolean pango_scan_int (const char **pos, int *out) { + return _pango_scan_int (pos, out); +} + +gboolean +_pango_scan_int (const char **pos, int *out) +{ char *end; long temp; @@ -553,7 +566,6 @@ pango_scan_int (const char **pos, int *out) return TRUE; } - /** * pango_config_key_get_system: * @key: Key to look up, in the form "SECTION/KEY". @@ -701,6 +713,16 @@ pango_parse_enum (GType type, gboolean warn, char **possible_values) { + return _pango_parse_enum (type, str, value, warn, possible_values); +} + +gboolean +_pango_parse_enum (GType type, + const char *str, + int *value, + gboolean warn, + char **possible_values) +{ GEnumClass *class = NULL; gboolean ret = TRUE; GEnumValue *v = NULL; |