diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | docs/tmpl/text-attributes.sgml | 2 | ||||
| -rw-r--r-- | pango/pango-language.c | 15 | ||||
| -rw-r--r-- | pango/pango-language.h | 1 | ||||
| -rw-r--r-- | pango/pango.def | 1 |
5 files changed, 30 insertions, 1 deletions
@@ -1,5 +1,17 @@ 2008-06-09 Behdad Esfahbod <behdad@gnome.org> + Bug 537258 – Add a pango_language_to_string() function + + * docs/tmpl/text-attributes.sgml: + * pango/pango-language.c (pango_language_to_string): + * pango/pango-language.h: + * pango/pango.def: + Add a function implementation of pango_language_to_string(). + The macro is still available. To be removed in a cycle or two from + now. (bug #537466) + +2008-06-09 Behdad Esfahbod <behdad@gnome.org> + Bug 537257 – pango_language_from_string(NULL) not happy * pango/pango-language.c (pango_language_from_string): diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml index 43cc1686..fa52ebe4 100644 --- a/docs/tmpl/text-attributes.sgml +++ b/docs/tmpl/text-attributes.sgml @@ -632,7 +632,7 @@ The #GObject type for #PangoLanguage. @Returns: -<!-- ##### MACRO pango_language_to_string ##### --> +<!-- ##### FUNCTION pango_language_to_string ##### --> <para> Returns a RFC-3066 format string representing the given language tag. </para> diff --git a/pango/pango-language.c b/pango/pango-language.c index 89e8f224..bd14b295 100644 --- a/pango/pango-language.c +++ b/pango/pango-language.c @@ -258,6 +258,21 @@ pango_language_from_string (const char *language) } /** + * pango_language_to_string: + * @language: a language tag. + * + * Gets the RFC-3066 format string representing the given language tag. + * + * Returns: a string representing the language tag. This is owned by + * Pango and should not be freed. + */ +G_CONST_RETURN char * +(pango_language_to_string) (PangoLanguage *language) +{ + return pango_language_to_string (language); +} + +/** * pango_language_matches: * @language: a language tag (see pango_language_from_string()), * %NULL is allowed and matches nothing but '*' diff --git a/pango/pango-language.h b/pango/pango-language.h index 9c1a9d8d..bbfe268b 100644 --- a/pango/pango-language.h +++ b/pango/pango-language.h @@ -35,6 +35,7 @@ typedef struct _PangoLanguage PangoLanguage; GType pango_language_get_type (void) G_GNUC_CONST; PangoLanguage *pango_language_from_string (const char *language); +G_CONST_RETURN char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST; #define pango_language_to_string(language) ((const char *)language) G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST; diff --git a/pango/pango.def b/pango/pango.def index df844683..89fae6c5 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -214,6 +214,7 @@ EXPORTS pango_language_get_type pango_language_includes_script pango_language_matches + pango_language_to_string pango_layout_context_changed pango_layout_copy pango_layout_get_alignment |