changeset 1948:78e8d9dd5036 trunk

[svn] - only use g_unichar_iswide_cjk if GLib 2.12 is available.
author nenolod
date Sun, 05 Nov 2006 15:09:25 -0800
parents eec23019ef57
children 4f869110ac7b
files ChangeLog audtool/audtool.c
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 05 14:27:21 2006 -0800
+++ b/ChangeLog	Sun Nov 05 15:09:25 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-05 22:27:21 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2851]
+  - remove symbols relating to GNOME_VFS
+  
+  trunk/mk/rules.mk.in |    2 --
+  1 file changed, 2 deletions(-)
+
+
 2006-11-05 21:59:09 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2849]
   - require at least 3 bytes of data to search
--- a/audtool/audtool.c	Sun Nov 05 14:27:21 2006 -0800
+++ b/audtool/audtool.c	Sun Nov 05 15:09:25 2006 -0800
@@ -523,7 +523,10 @@
 				gint stride;
 				stride = g_utf8_next_char(p) - p;
 				if(g_unichar_iswide(g_utf8_get_char(p)) ||
-				   g_unichar_iswide_cjk(g_utf8_get_char(p))){
+#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 12)
+				   || g_unichar_iswide_cjk(g_utf8_get_char(p))
+#endif
+                                ){
 					column += (stride - 2);
 				}
 				else {