pango r2651 - in trunk: . docs/tmpl pango

[behdad svn gnome org]

Author: behdad
Date: Mon Jun  9 19:53:20 2008
New Revision: 2651
URL: http://svn.gnome.org/viewvc/pango?rev=2651&view=rev

Log:
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)



Modified:
   trunk/ChangeLog
   trunk/docs/tmpl/text-attributes.sgml
   trunk/pango/pango-language.c
   trunk/pango/pango-language.h
   trunk/pango/pango.def

Modified: trunk/docs/tmpl/text-attributes.sgml
==============================================================================
--- trunk/docs/tmpl/text-attributes.sgml	(original)
+++ trunk/docs/tmpl/text-attributes.sgml	Mon Jun  9 19:53:20 2008
@@ -632,7 +632,7 @@
 @Returns: 
 
 
-<!-- ##### MACRO pango_language_to_string ##### -->
+<!-- ##### FUNCTION pango_language_to_string ##### -->
 <para>
 Returns a RFC-3066 format string representing the given language tag. 
 </para>

Modified: trunk/pango/pango-language.c
==============================================================================
--- trunk/pango/pango-language.c	(original)
+++ trunk/pango/pango-language.c	Mon Jun  9 19:53:20 2008
@@ -258,6 +258,21 @@
 }
 
 /**
+ * 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 '*'

Modified: trunk/pango/pango-language.h
==============================================================================
--- trunk/pango/pango-language.h	(original)
+++ trunk/pango/pango-language.h	Mon Jun  9 19:53:20 2008
@@ -35,6 +35,7 @@
 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;

Modified: trunk/pango/pango.def
==============================================================================
--- trunk/pango/pango.def	(original)
+++ trunk/pango/pango.def	Mon Jun  9 19:53:20 2008
@@ -214,6 +214,7 @@
 	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