glib r7161 - in trunk: . glib

[behdad svn gnome org]

Author: behdad
Date: Fri Jul  4 18:05:13 2008
New Revision: 7161
URL: http://svn.gnome.org/viewvc/glib?rev=7161&view=rev

Log:
2008-07-04  Behdad Esfahbod  <behdad gnome org>

        Bug 541507 â Ambiguous description of assigned characters in the Glib
        Unicode Manipulation reference

        * glib/guniprop.c
        (g_unichar_isgraph): Return true for PrivateUse too.
        (g_unichar_isprint): Return true for PrivateUse too.
        (g_unichar_isdefined): Return false for Surrogate.



Modified:
   trunk/ChangeLog
   trunk/glib/guniprop.c

Modified: trunk/glib/guniprop.c
==============================================================================
--- trunk/glib/guniprop.c	(original)
+++ trunk/glib/guniprop.c	Fri Jul  4 18:05:13 2008
@@ -175,10 +175,9 @@
 	      OR (G_UNICODE_CONTROL,
 	      OR (G_UNICODE_FORMAT,
 	      OR (G_UNICODE_UNASSIGNED,
-	      OR (G_UNICODE_PRIVATE_USE,
 	      OR (G_UNICODE_SURROGATE,
 	      OR (G_UNICODE_SPACE_SEPARATOR,
-	     0)))))));
+	     0))))));
 }
 
 /**
@@ -216,9 +215,8 @@
 	      OR (G_UNICODE_CONTROL,
 	      OR (G_UNICODE_FORMAT,
 	      OR (G_UNICODE_UNASSIGNED,
-	      OR (G_UNICODE_PRIVATE_USE,
 	      OR (G_UNICODE_SURROGATE,
-	     0))))));
+	     0)))));
 }
 
 /**
@@ -377,7 +375,10 @@
 gboolean
 g_unichar_isdefined (gunichar c)
 {
-  return TYPE (c) != G_UNICODE_UNASSIGNED;
+  return !IS (TYPE(c),
+	      OR (G_UNICODE_UNASSIGNED,
+	      OR (G_UNICODE_SURROGATE,
+	     0)));
 }
 
 /**