Small fixes

diff --git a/ChangeLog b/ChangeLog
index 1c52ca35f3e9ea56fe2b35ac58f7727f286e8b4d..3191f7d8ccf48c3da30da1b882e0160250db2080 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Add g_unichar_iswide_cjk.
+       * glib/guniprop.c: Add a "Since: 2.12".
+
         * NEWS: Updates
 
 2006-04-27  Behdad Esfahbod  <behdad@gnome.org>

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1c52ca35f3e9ea56fe2b35ac58f7727f286e8b4d..3191f7d8ccf48c3da30da1b882e0160250db2080 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2006-04-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/glib.symbols: Add g_unichar_iswide_cjk.
+       * glib/guniprop.c: Add a "Since: 2.12".
+
         * NEWS: Updates
 
 2006-04-27  Behdad Esfahbod  <behdad@gnome.org>

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 2a9a27d20da9fbf940676ab4cab30f9e981e8040..05aac3bd46b5425b3ea236caad52df0a539d2930 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1235,6 +1235,7 @@ g_unichar_isspace G_GNUC_CONST
 g_unichar_istitle G_GNUC_CONST
 g_unichar_isupper G_GNUC_CONST
 g_unichar_iswide G_GNUC_CONST
+g_unichar_iswide_cjk G_GNUC_CONST
 g_unichar_isxdigit G_GNUC_CONST
 g_unichar_tolower G_GNUC_CONST
 g_unichar_totitle G_GNUC_CONST

diff --git a/glib/guniprop.c b/glib/guniprop.c
index a5acc8401d5e51d2127bf0091e0b7171d7a8cba6..af40130d7721670c8f9bf4ae09d7dbb3ddc1d9bb 100644 (file)
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -412,10 +412,12 @@ interval_compare (const void *key, const void *elt)
  * g_unichar_iswide(), then it is also reported wide with this function, but
  * the converse is not necessarily true.  See the
  * <ulink url="http://www.unicode.org/reports/tr11/">Unicode Standard
- * Annex #11</ulink> for details:
+ * Annex #11</ulink> for details.
  * 
  * Return value: %TRUE if the character is wide in legacy East Asian locales
- **/
+ *
+ * Since: 2.12
+ */
 /* This function stolen from Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>.  */
 gboolean
 g_unichar_iswide_cjk (gunichar c)